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

Pass parent filter to inner hit query #13770

Merged
merged 1 commit into from
May 30, 2024

Conversation

heemin32
Copy link
Contributor

@heemin32 heemin32 commented May 21, 2024

Description

Parent filter is passed to nested query in #10246 PR. The same parent filter should be passed to inner query so that innerHit can utilize the data for correct innerHit result. Without this PR, the result in innerHit does not align with original query result.

Related Issues

opensearch-project/k-NN#1447

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • API changes companion pull request created.
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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 6ee7e12: 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
Contributor

❌ Gradle check result for 8cc60d4: 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
Contributor

✅ Gradle check result for cd6ae37: SUCCESS

@heemin32
Copy link
Contributor Author

heemin32 commented May 21, 2024

@msfroh Could you take a look?
This also need to be back ported to 2.x.

Copy link

codecov bot commented May 22, 2024

Codecov Report

Attention: Patch coverage is 83.33333% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 71.55%. Comparing base (b15cb0c) to head (cd6ae37).
Report is 321 commits behind head on main.

Current head cd6ae37 differs from pull request most recent head 9d39472

Please upload reports for the commit 9d39472 to get more accurate results.

Files Patch % Lines
...org/opensearch/index/query/NestedQueryBuilder.java 83.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13770      +/-   ##
============================================
+ Coverage     71.42%   71.55%   +0.13%     
- Complexity    59978    61231    +1253     
============================================
  Files          4985     5062      +77     
  Lines        282275   287912    +5637     
  Branches      40946    41693     +747     
============================================
+ Hits         201603   206009    +4406     
- Misses        63999    64894     +895     
- Partials      16673    17009     +336     

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

@msfroh msfroh added the backport 2.x Backport to 2.x branch label May 29, 2024
Copy link
Contributor

❌ Gradle check result for f54232b: 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?

@heemin32 heemin32 requested a review from msfroh May 30, 2024 03:50
@msfroh msfroh merged commit db5240e into opensearch-project:main May 30, 2024
28 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-13770-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 db5240e06dc08e7d7d03432595bb4d93b0e2e32d
# Push it to GitHub
git push --set-upstream origin backport/backport-13770-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-13770-to-2.x.

@msfroh
Copy link
Collaborator

msfroh commented May 30, 2024

Uh-oh -- @heemin32, it looks like we have a failing test that's probably related to this change:

https://build.ci.opensearch.org/job/gradle-check/39435/testReport/junit/org.opensearch.index.query/NestedQueryBuilderTests/testParentFilterFromInlineLeafInnerHitsNestedQuery/

It seems to reliably reproduce with the following:

./gradlew ':server:test' --tests "org.opensearch.index.query.NestedQueryBuilderTests.testParentFilterFromInlineLeafInnerHitsNestedQuery" -Dtests.seed=82773C9793E6B096 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=es-GT -Dtests.timezone=Europe/Astrakhan -Druntime.java=21

@msfroh
Copy link
Collaborator

msfroh commented May 30, 2024

Created a flaky test issue for it at #13890.

It doesn't fail all the time, but it fails frequently enough that it's really annoying. We may want to consider reverting this change until we have a fix.

heemin32 added a commit to heemin32/OpenSearch that referenced this pull request May 30, 2024
msfroh pushed a commit that referenced this pull request May 30, 2024
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants