-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Do not evaluate shard_size and shard_min_doc_count at segment slice level #9085
Conversation
Gradle Check (Jenkins) Run Completed with:
|
95e8eab
to
d1e5d1c
Compare
The
|
d1e5d1c
to
978b105
Compare
...src/main/java/org/opensearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/search/aggregations/bucket/LocalBucketCountThresholds.java
Outdated
Show resolved
Hide resolved
It looks pretty clean, thanks @jed326 ! |
… values Signed-off-by: Jay Deng <[email protected]>
2b210a6
to
3b55340
Compare
Compatibility status:
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:
|
https://build.ci.opensearch.org/job/gradle-check/22262/#showFailuresLink Build failures are from unrelated cluster routing tests. @reta I think we are good to merge if it looks good to you. Thanks! |
Yes, flaky tests but we need green checks, rerurn it |
Gradle Check (Jenkins) Run Completed with:
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-9085-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 15b7de00f2ff75587560ac6e38ffb20da030178e
# Push it to GitHub
git push --set-upstream origin backport/backport-9085-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
@jed326 sadly backport failed, could you please send manual one? |
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]>
…evel (#9085) (#9211) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search * Addressing comments * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms * Introduce LocalBucketCountThresholds for local size and min_doc_count values --------- Signed-off-by: Jay Deng <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]> Signed-off-by: Ivan Brusic <[email protected]>
…evel (opensearch-project#9085) * Use BucketCountThresholds in InternalTerms and InternalAggregations and do not apply shard level thresholds at slice level for Concurrent Segment Search Signed-off-by: Jay Deng <[email protected]> * Addressing comments Signed-off-by: Jay Deng <[email protected]> * Re-introduce shardSize member to InternalMultiTerms and InternalMappedTerms Signed-off-by: Jay Deng <[email protected]> * Introduce LocalBucketCountThresholds for local size and min_doc_count values Signed-off-by: Jay Deng <[email protected]> --------- Signed-off-by: Jay Deng <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>
Description
Refactored
InternalTerms
andInternalSignificantTerms
to takeBucketCountThresholds
in the constructor. Using this we can determine which values to use when doing reduce at the shard vs coordinator level.This resolves the test failures in
TermsShardMinDocCountIT
andShardSizeTermsIT
, however it does not address the failures inTermsDocCountErrorIT
.Related Issues
Resolves #8860
Check List
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.