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

[Backport 2.x] Support multi ranges traversal when doing date histogram rewrite optimization (#13317) #13522

Merged
merged 2 commits into from
May 3, 2024

Conversation

bowenlan-amzn
Copy link
Member

@bowenlan-amzn bowenlan-amzn commented May 3, 2024

Description

Manual backport because auto backport failed #13317 (comment)

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

@bowenlan-amzn bowenlan-amzn changed the title Support multi ranges traversal when doing date histogram rewrite opti… [Backport 2.x] Support multi ranges traversal when doing date histogram rewrite optimization (#13317) May 3, 2024
…mization (opensearch-project#13317)

Signed-off-by: bowenlan-amzn <[email protected]>

remove unnecessary change log

Signed-off-by: bowenlan-amzn <[email protected]>
Copy link
Contributor

github-actions bot commented May 3, 2024

❌ Gradle check result for 2d66adb: 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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

❌ Gradle check result for 2d1e7f4: TIMEOUT

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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

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

github-actions bot commented May 3, 2024

✅ Gradle check result for fdbbd83: SUCCESS

Copy link

codecov bot commented May 3, 2024

Codecov Report

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

Project coverage is 71.32%. Comparing base (0dd892c) to head (fdbbd83).
Report is 229 commits behind head on 2.x.

Files Patch % Lines
...h/aggregations/bucket/FastFilterRewriteHelper.java 90.58% 6 Missing and 10 partials ⚠️
.../bucket/histogram/AutoDateHistogramAggregator.java 22.22% 7 Missing ⚠️
...egations/bucket/composite/CompositeAggregator.java 40.00% 6 Missing ⚠️
...ions/bucket/histogram/DateHistogramAggregator.java 28.57% 5 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #13522      +/-   ##
============================================
+ Coverage     71.28%   71.32%   +0.04%     
- Complexity    60145    61171    +1026     
============================================
  Files          4957     5026      +69     
  Lines        282799   287653    +4854     
  Branches      41409    42058     +649     
============================================
+ Hits         201591   205172    +3581     
- Misses        64189    65166     +977     
- Partials      17019    17315     +296     

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

@msfroh msfroh merged commit ab62002 into opensearch-project:2.x May 3, 2024
103 of 106 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.14 failed:

The process '/usr/bin/git' failed with exit code 128

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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-13522-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ab620026b7a0cc8d47a1327c2550680d4d6f132a
# Push it to GitHub
git push --set-upstream origin backport/backport-13522-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.14

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-13522-to-2.14.

@bowenlan-amzn bowenlan-amzn deleted the backport13317to2.x branch June 22, 2024 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.14 Backport to 2.14 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants