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

Fixed inefficient Stream API call chains ending with count() #15386

Merged
merged 3 commits into from
Oct 17, 2024

Conversation

dk2k
Copy link
Contributor

@dk2k dk2k commented Aug 23, 2024

Fixed inefficient Stream API call chains ending with count()

Copy link
Contributor

❌ Gradle check result for 72ebe23: 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-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 Sep 25, 2024
@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Oct 9, 2024
@sandeshkr419 sandeshkr419 added backport 2.x Backport to 2.x branch skip-changelog labels Oct 14, 2024
Copy link
Contributor

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

@sandeshkr419
Copy link
Contributor

* What went wrong:
Execution failed for task ':distribution:bwc:minor:buildBwcLinuxTar'.
> Building 2.17.0 didn't generate expected file /var/jenkins/workspace/gradle-check/search/distribution/bwc/minor/build/bwc/checkout-2.x/distribution/archives/linux-tar/build/distributions/opensearch-min-2.17.0-SNAPSHOT-linux-x64.tar.gz

@dk2k I think you will have to rebase your changes against main branch for gradle checks to succeed since 2.17 is released after this PR was opened up.

Copy link
Contributor

✅ Gradle check result for 759c383: SUCCESS

Copy link

codecov bot commented Oct 15, 2024

Codecov Report

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

Project coverage is 71.99%. Comparing base (ec7b652) to head (6e65bca).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
.../java/org/opensearch/percolator/QueryAnalyzer.java 85.71% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #15386      +/-   ##
============================================
- Coverage     72.00%   71.99%   -0.01%     
+ Complexity    64817    64806      -11     
============================================
  Files          5307     5307              
  Lines        302660   302664       +4     
  Branches      43724    43726       +2     
============================================
- Hits         217931   217914      -17     
+ Misses        66906    66875      -31     
- Partials      17823    17875      +52     

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

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.

Thanks for these changes, @dk2k ! Appreciate your patience as we've reviewed them.

One last thing we'd like is an entry in CHANGELOG.md summarizing this PR. There's an open issue on percolator performance (#16285) so adding an entry showing an attempt to improve at least a portion of it would be helpful.

Ready to approve pending this entry.

Copy link
Contributor

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

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.

Re-approving, will merge once CI completes

dk2k added 2 commits October 16, 2024 17:00
Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
Copy link
Contributor

✅ Gradle check result for 6e65bca: SUCCESS

@dbwiddis dbwiddis merged commit 1a7018a into opensearch-project:main Oct 17, 2024
38 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15386-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1a7018abf1884a287d05681358efa600471c810b
# Push it to GitHub
git push --set-upstream origin backport/backport-15386-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15386-to-2.x.

dbwiddis pushed a commit to dbwiddis/OpenSearch that referenced this pull request Oct 17, 2024
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dbwiddis pushed a commit to dbwiddis/OpenSearch that referenced this pull request Oct 17, 2024
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dbwiddis pushed a commit to dbwiddis/OpenSearch that referenced this pull request Oct 17, 2024
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dk2k added a commit to dk2k/OpenSearch that referenced this pull request Oct 17, 2024
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
dk2k added a commit to dk2k/OpenSearch that referenced this pull request Oct 21, 2024
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
owaiskazi19 pushed a commit that referenced this pull request Oct 22, 2024
…#16361)

* Fixed inefficient Stream API call chains ending with count()



* Refactored method minTermLength() as per @sandeshkr419's advice



* Added a line in CHANGELOG.md



---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
Signed-off-by: Daniel Widdis <widdis@gmail.com>
Co-authored-by: Dmitry Kryukov <dk2k@ya.ru>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Jan 21, 2025
…rch-project#15386)

* Fixed inefficient Stream API call chains ending with count()

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Refactored method minTermLength() as per @sandeshkr419's advice

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

* Added a line in CHANGELOG.md

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>

---------

Signed-off-by: Dmitry Kryukov <dk2k@ya.ru>
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 backport-failed skip-changelog v2.18.0 Issues and PRs related to version 2.18.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants