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

Show only intersecting buckets to the Adjacency matrix aggregation #11733

Conversation

brusic
Copy link
Contributor

@brusic brusic commented Jan 3, 2024

Re-release of a previous PR that did not correctly sign the commit

Description

Show only intersecting buckets to the Adjacency matrix aggregation

The Adjacency matrix aggregation will compute and return all buckets related to any of the combinations of the filters specified, including hits on a single filter. However, sometimes a user would want to return only the buckets related to an intersection and not for a single filter. An optional show_only_intersecting parameter would stop buckets resulting from a single filter being hit to be created.

Related Issues

#8832

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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

github-actions bot commented Jan 3, 2024

Compatibility status:

Checks if related components are compatible with change dc5897b

Incompatible components

Skipped components

Compatible components

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

Copy link
Contributor

github-actions bot commented Jan 3, 2024

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

@brusic
Copy link
Contributor Author

brusic commented Jan 3, 2024

Apparently failed with > Task :qa:wildfly:spotlessMisc FAILED, but it is working locally using jdk11. No issues mentioning a flaky test.

Jenkins error

* What went wrong:
A problem was found with the configuration of task ':qa:wildfly:spotlessMisc' (type 'SpotlessTaskImpl').
  - Gradle detected a problem with the following location: '/var/jenkins/workspace/gradle-check/search/qa/wildfly'.
    
    Reason: Task ':qa:wildfly:spotlessMisc' uses this output of task ':qa:wildfly:preProcessFixture' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed.
    
    Possible solutions:
      1. Declare task ':qa:wildfly:preProcessFixture' as an input of ':qa:wildfly:spotlessMisc'.
      2. Declare an explicit dependency on ':qa:wildfly:preProcessFixture' from ':qa:wildfly:spotlessMisc' using Task#dependsOn.
      3. Declare an explicit dependency on ':qa:wildfly:preProcessFixture' from ':qa:wildfly:spotlessMisc' using Task#mustRunAfter.

Local execution

% ./gradlew :qa:wildfly:spotlessMisc      

> Configure project :
========================= WARNING =========================
         Backwards compatibility tests are disabled!
See https://github.com/opensearch-project/OpenSearch/issues/4173
===========================================================
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.5
  OS Info               : Mac OS X 13.4.1 (x86_64)
  JDK Version           : 11 (Homebrew JDK)
  JAVA_HOME             : /usr/local/Cellar/openjdk@11/11.0.21/libexec/openjdk.jdk/Contents/Home
  Random Testing Seed   : 4202A040C72920CD
  In FIPS 140 mode      : false
=======================================

BUILD SUCCESSFUL in 7s
10 actionable tasks: 1 executed, 9 up-to-date

% ./gradlew :qa:wildfly:preProcessFixture

> Configure project :
========================= WARNING =========================
         Backwards compatibility tests are disabled!
See https://github.com/opensearch-project/OpenSearch/issues/4173
===========================================================
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.5
  OS Info               : Mac OS X 13.4.1 (x86_64)
  JDK Version           : 11 (Homebrew JDK)
  JAVA_HOME             : /usr/local/Cellar/openjdk@11/11.0.21/libexec/openjdk.jdk/Contents/Home
  Random Testing Seed   : E8272F8D6651F238
  In FIPS 140 mode      : false
=======================================

BUILD SUCCESSFUL in 6s
189 actionable tasks: 3 executed, 186 up-to-date

brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 5, 2024
Copy link
Contributor

github-actions bot commented Nov 5, 2024

✅ Gradle check result for 0d7fd10: SUCCESS

Copy link

codecov bot commented Nov 5, 2024

Codecov Report

Attention: Patch coverage is 57.57576% with 14 lines in your changes missing coverage. Please review.

Project coverage is 72.19%. Comparing base (e7e19f7) to head (4eb5173).
Report is 13 commits behind head on main.

Files with missing lines Patch % Lines
...t/adjacency/AdjacencyMatrixAggregationBuilder.java 69.23% 3 Missing and 5 partials ⚠️
...ns/bucket/adjacency/AdjacencyMatrixAggregator.java 0.00% 5 Missing ⚠️
...et/adjacency/AdjacencyMatrixAggregatorFactory.java 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #11733      +/-   ##
============================================
- Coverage     72.20%   72.19%   -0.01%     
+ Complexity    65289    65254      -35     
============================================
  Files          5299     5299              
  Lines        303536   303560      +24     
  Branches      43941    43946       +5     
============================================
- Hits         219180   219167      -13     
- Misses        66441    66452      +11     
- Partials      17915    17941      +26     

☔ 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 Nov 5, 2024
@msfroh
Copy link
Collaborator

msfroh commented Nov 5, 2024

Thanks @brusic! There are a couple of commits that are not signed off (with git commit -s). Your easiest option is probably to do a git rebase -i, squash all your commits down into a single commit, then you can hit that with git commit --amend -s.

Also, could you please add a changelog entry to https://github.com/opensearch-project/OpenSearch/blob/main/CHANGELOG.md?

brusic added a commit to brusic/OpenSearch that referenced this pull request Nov 13, 2024
@brusic brusic force-pushed the brusic/8832-show-only-intersecting-adjacency branch from 0d7fd10 to cb96ab7 Compare November 13, 2024 16:56
Copy link
Contributor

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

@brusic brusic force-pushed the brusic/8832-show-only-intersecting-adjacency branch from cb96ab7 to 5610ad1 Compare January 8, 2025 00:36
brusic added a commit to brusic/OpenSearch that referenced this pull request Jan 8, 2025
Signed-off-by: Ivan Brusic <[email protected]>

Consistent naming (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Spotless fix (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Skip versions for BWC (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Cannot find the source of Invalid string; unexpected character: 128 hex: 80] (Euro sign) (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Add node_selector (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Add BWC checks in serialized object (opensearch-project#11733)

Add BWC checks in REST api test (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>
Copy link
Contributor

github-actions bot commented Jan 8, 2025

✅ Gradle check result for 5610ad1: SUCCESS

Signed-off-by: Ivan Brusic <[email protected]>

Consistent naming (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Spotless fix (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Skip versions for BWC (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Cannot find the source of Invalid string; unexpected character: 128 hex: 80] (Euro sign) (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Add node_selector (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Add BWC checks in serialized object (opensearch-project#11733)

Add BWC checks in REST api test (opensearch-project#11733)

Signed-off-by: Ivan Brusic <[email protected]>

Add more tests to increase code coverage
@brusic brusic force-pushed the brusic/8832-show-only-intersecting-adjacency branch from 5610ad1 to 02f135f Compare January 9, 2025 22:49
Copy link
Contributor

github-actions bot commented Jan 9, 2025

✅ Gradle check result for 02f135f: SUCCESS

Copy link
Contributor

✅ Gradle check result for 4eb5173: SUCCESS

@msfroh msfroh merged commit 8d5e1a3 into opensearch-project:main Jan 11, 2025
39 of 41 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 11, 2025
…11733)

Signed-off-by: Ivan Brusic <[email protected]>
(cherry picked from commit 8d5e1a3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants