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

[Backport 2.x] Allow composite aggregation under filter or reverse_nested parent #12151

Merged
merged 1 commit into from
Feb 22, 2024
Merged

[Backport 2.x] Allow composite aggregation under filter or reverse_nested parent #12151

merged 1 commit into from
Feb 22, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 24b0cc9 from #11499.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 2, 2024 •
edited
Loading

Compatibility status:

Checks if related components are compatible with change b7debe5

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer.git]

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 2, 2024

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 6, 2024

❕ Gradle check result for babb238: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testTrackerData
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=search.aggregation/20_terms/string profiler via global ordinals}

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 Feb 6, 2024 •
edited
Loading

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (74bd8f8) 71.21% compared to head (b7debe5) 71.19%.
Report is 22 commits behind head on 2.x.

Files Patch % Lines
.../bucket/composite/CompositeAggregationBuilder.java 75.00% 0 Missing and 1 partial ⚠️
...gations/bucket/filter/FilterAggregatorFactory.java 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x   #12151      +/-   ##
============================================
- Coverage     71.21%   71.19%   -0.03%     
+ Complexity    60004    59974      -30     
============================================
  Files          4944     4944              
  Lines        282197   282197              
  Branches      41335    41335              
============================================
- Hits         200969   200912      -57     
- Misses        64241    64284      +43     
- Partials      16987    17001      +14

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

@github-actions @andrross
Allow composite aggregation under filter or reverse_nested parent (#1…
b7debe5 
…1499)

* Allow composite aggregation under filter parent

Composite aggregations are able to run under a filter aggregation
with no change required (other than not throwing an exception).

Also cleaned up FilterAggregatorFactory a little.

Signed-off-by: Michael Froh <[email protected]>

* Add changelog entry

Signed-off-by: Michael Froh <[email protected]>

* Add support for reverse nested agg too

Signed-off-by: Michael Froh <[email protected]>

* Add unit test coverage

Signed-off-by: Michael Froh <[email protected]>

* Skip new tests in pre-3.0 mixed cluster

Signed-off-by: Michael Froh <[email protected]>

---------

Signed-off-by: Michael Froh <[email protected]>
(cherry picked from commit 24b0cc9)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@andrross andrross force-pushed the backport/backport-11499-to-2.x branch from babb238 to b7debe5 Compare February 14, 2024 00:49
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

❕ Gradle check result for b7debe5: UNSTABLE

  • TEST FAILURES:
      2 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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

@msfroh msfroh merged commit 44f1417 into 2.x Feb 22, 2024
29 of 30 checks passed
@github-actions github-actions bot deleted the backport/backport-11499-to-2.x branch February 22, 2024 20:47
This was referenced Feb 29, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deshsidd deshsidd deshsidd approved these changes

@VachaShah VachaShah VachaShah approved these changes

@kkmr kkmr kkmr approved these changes

@abbashus abbashus Awaiting requested review from abbashus

@adnapibar adnapibar Awaiting requested review from adnapibar

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

@andrross andrross Awaiting requested review from andrross andrross 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

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

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

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

@kartg kartg Awaiting requested review from kartg

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

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

@msfroh msfroh Awaiting requested review from msfroh msfroh 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

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@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

@tlfeng tlfeng Awaiting requested review from tlfeng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kkmr @VachaShah @deshsidd @msfroh