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.

Sign up for GitHub

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

Jump to bottom

Fix: visit of inner query for FunctionScoreQueryBuilder #15404

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix: visit of inner query for FunctionScoreQueryBuilder #15404

wants to merge 5 commits into from

Conversation

jdnvn
Copy link

@jdnvn jdnvn commented Aug 25, 2024

Description

Similar to #14739, but implements the visit method in FunctionScoreQueryBuilder to allow subqueries to be processed properly.

Related Issues

Resolves #15403
Similar to #15034

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.

@github-actions github-actions bot added bug Something isn't working Search:Query Capabilities labels Aug 25, 2024
@jdnvn jdnvn mentioned this pull request Aug 25, 2024
Closed
@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for 7bac688: SUCCESS

@github-actions GitHub Actions
Copy link
Contributor

❕ Gradle check result for d8e8390: 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.

@codecov Codecov
Copy link

codecov bot commented Aug 25, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 75.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 71.92%. Comparing base (6152afe) to head (3258eea).
Report is 16 commits behind head on main.

Files Patch % Lines
...query/functionscore/FunctionScoreQueryBuilder.java 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #15404      +/-   ##
============================================
- Coverage     71.95%   71.92%   -0.03%     
+ Complexity    63254    63229      -25     
============================================
  Files          5224     5224              
  Lines        296079   296083       +4     
  Branches      42763    42764       +1     
============================================
- Hits         213030   212946      -84     
- Misses        65550    65671     +121     
+ Partials      17499    17466      -33

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

@jdnvn jdnvn mentioned this pull request Aug 25, 2024
Closed
5 tasks
@msfroh
Copy link
Collaborator

msfroh commented Oct 14, 2024

Since we've had at least one release since this PR was opened, we'll need to rebase it onto the latest main branch to pick up new version constants. I can take care of that during my business hours (US PDT) tomorrow.

@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Oct 14, 2024
@prudhvigodithi prudhvigodithi mentioned this pull request Oct 16, 2024
Open
vibrantvarun
vibrantvarun approved these changes Oct 18, 2024
View reviewed changes
Copy link
Member

@vibrantvarun vibrantvarun left a comment

Choose a reason for hiding this comment

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

LGTM

dbwiddis
dbwiddis approved these changes Oct 18, 2024
View reviewed changes
Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

LGTM!

@opensearch-trigger-bot
Copy link
Contributor

This PR is stalled because it has been open for 30 days with no activity.

@opensearch-trigger-bot opensearch-trigger-bot bot added the stalled Issues that have stalled label Nov 18, 2024
@kodieg
Copy link

kodieg commented Dec 4, 2024

Will this change make into the next release?

@dblock
Copy link
Member

dblock commented Dec 4, 2024

Will this change make into the next release?

Someone needs to rebase this PR against main and iterate it to green. Looks like @jdnvn is unfortunately MIA, care to help?

@kodieg kodieg mentioned this pull request Dec 4, 2024
Open
3 tasks
@kodieg
Copy link

kodieg commented Dec 5, 2024

Opened a new PR #16776

@kodieg
Copy link

kodieg commented Dec 10, 2024

@dblock I rebased today and it seems that all tests has passed. #16776

Should I do anything else?

@jdnvn jdnvn closed this Feb 8, 2025
jdnvn added 2 commits February 8, 2025 12:59
@jdnvn
add visitor logic to FunctionScoreQueryBuilder
b46dce1 
Signed-off-by: jdnvn <joe@donovan.to>
@jdnvn
update changelog
4bf5938 
Signed-off-by: jdnvn <joe@donovan.to>
@jdnvn jdnvn reopened this Feb 8, 2025
@jdnvn jdnvn requested a review from cwperks as a code owner February 8, 2025 18:05
@jdnvn
Copy link
Author

jdnvn commented Feb 8, 2025 •
edited
Loading

Will this change make into the next release?

Someone needs to rebase this PR against main and iterate it to green. Looks like @jdnvn is unfortunately MIA, care to help?

@dblock I apologize for my lack of responsiveness, I have been caught up with work. I just fixed the PR, we should be good to go once CI passes!

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 2025

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

@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Feb 9, 2025
Closed
jdnvn added 2 commits February 12, 2025 22:07
@jdnvn
Merge branch 'main' into main
94b06a4 
Signed-off-by: Joe Donovan <jsphdnvn@gmail.com>
@jdnvn
fix merge issue
5719318 
Signed-off-by: Joe Donovan <jsphdnvn@gmail.com>
@github-actions GitHub Actions
Copy link
Contributor

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

@jdnvn
Merge branch 'main' into main
b9e9a20 
Signed-off-by: Joe Donovan <jsphdnvn@gmail.com>
@github-actions GitHub Actions
Copy link
Contributor

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

@jdnvn
Copy link
Author

jdnvn commented Feb 16, 2025

@dblock @dbwiddis @vibrantvarun are these tests flaky? It doesn't look like they are related to the change

 - org.opensearch.action.admin.cluster.tasks.PendingTasksBlocksIT.testPendingTasksWithClusterNotRecoveredBlock
 - org.opensearch.action.admin.cluster.tasks.PendingTasksBlocksIT.testPendingTasksWithClusterReadOnlyBlock
 - org.opensearch.remotemigration.RemotePrimaryRelocationIT.testMixedModeRelocation_FailInFinalize
 - org.opensearch.snapshots.DedicatedClusterSnapshotRestoreIT.testSnapshotWithStuckNode

This was referenced Feb 17, 2025
Open
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbwiddis dbwiddis dbwiddis approved these changes

@vibrantvarun vibrantvarun vibrantvarun approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jed326 jed326 Awaiting requested review from jed326 jed326 is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch bug Something isn't working Search:Query Capabilities stalled Issues that have stalled v2.17.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] Cannot make use of default_model_id in function_score query type
10 participants
@jdnvn @yuye-aws @zhichao-aws @msfroh @kodieg @dblock @dbwiddis @vibrantvarun @gaobinlong @sandeshkr419