Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Propagate includes and excludes from fetchSourceContext to FieldsVisitor #17080

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

Gankris96
Copy link
Contributor

@Gankris96 Gankris96 commented Jan 21, 2025

Description

The change is to propagate the source includes and source excludes fields that are present in the FetchSourceContext.
This is as part of the open questions in this RFC opensearch-project/k-NN#2377

Related Issues

PR is part of #2377
as part of the Derived source feature for k-NN.

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Copy link
Contributor

✅ Gradle check result for e17d6f9: SUCCESS

Copy link

codecov bot commented Jan 22, 2025

Codecov Report

Attention: Patch coverage is 73.91304% with 6 lines in your changes missing coverage. Please review.

Project coverage is 72.28%. Comparing base (13ab4ec) to head (eaec888).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...n/java/org/opensearch/search/fetch/FetchPhase.java 40.00% 0 Missing and 6 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #17080      +/-   ##
============================================
- Coverage     72.32%   72.28%   -0.05%     
+ Complexity    65477    65441      -36     
============================================
  Files          5309     5309              
  Lines        304306   304324      +18     
  Branches      44124    44132       +8     
============================================
- Hits         220098   219985     -113     
- Misses        66159    66278     +119     
- Partials      18049    18061      +12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Gankris96
Copy link
Contributor Author

@jmazanec15 please take a look

Copy link
Contributor

❕ Gradle check result for 8a7b739: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@Gankris96 Gankris96 force-pushed the derived-source-poc branch 2 times, most recently from 1584d62 to 2d45546 Compare January 22, 2025 22:42
Copy link
Contributor

❌ Gradle check result for 2d45546: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Member

@jmazanec15 jmazanec15 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall structure looks good to me. A couple comments on the test

Copy link
Contributor

❕ Gradle check result for 018905d: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link
Contributor

❌ Gradle check result for 9439534: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@Gankris96 Gankris96 force-pushed the derived-source-poc branch 3 times, most recently from caeedd9 to 9708a84 Compare January 24, 2025 00:01
@jed326 jed326 added v2.19.0 Issues and PRs related to version 2.19.0 backport 2.x Backport to 2.x branch labels Jan 24, 2025
Copy link
Contributor

✅ Gradle check result for eaec888: SUCCESS

Copy link
Collaborator

@jed326 jed326 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, will wait on @jmazanec15 to take another look as well.

Copy link
Member

@jmazanec15 jmazanec15 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks @Gankris96

@jed326 jed326 merged commit 931c1aa into opensearch-project:main Jan 24, 2025
37 of 39 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-17080-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 931c1aadaed0d8eccee0839d74d706fb47dbd4be
# Push it to GitHub
git push --set-upstream origin backport/backport-17080-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-17080-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed v2.19.0 Issues and PRs related to version 2.19.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants