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

Delegating CachingWeightWrapper#count to internal weight object #10543

Merged
merged 8 commits into from
Nov 22, 2023

Conversation

niyatiagg
Copy link
Contributor

@niyatiagg niyatiagg commented Oct 10, 2023

Description

Delegating from CachingWeightWrapper#count to internal weight object

Related Issues

Resolves #10060

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)
  • [ ] 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.

…object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Oct 10, 2023

Compatibility status:

Checks if related components are compatible with change 966ae6e

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

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

@opensearch-trigger-bot opensearch-trigger-bot bot added the stalled Issues that have stalled label Nov 13, 2023
Copy link
Contributor

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

@jainankitk jainankitk removed the stalled Issues that have stalled label Nov 21, 2023
@jainankitk
Copy link
Collaborator

Needed for #11083

@msfroh
Copy link
Collaborator

msfroh commented Nov 21, 2023

@niyatiagg -- Can you please add an entry to the CHANGELOG.md file, under the "Unreleased 2.x" section?

Copy link
Contributor

✅ Gradle check result for 966ae6e: SUCCESS

Copy link

codecov bot commented Nov 22, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b974dfb) 71.27% compared to head (966ae6e) 71.17%.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #10543      +/-   ##
============================================
- Coverage     71.27%   71.17%   -0.11%     
+ Complexity    58932    58836      -96     
============================================
  Files          4890     4890              
  Lines        277421   277423       +2     
  Branches      40308    40308              
============================================
- Hits         197723   197445     -278     
- Misses        63250    63491     +241     
- Partials      16448    16487      +39     

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

@andrross andrross added the backport 2.x Backport to 2.x branch label Nov 22, 2023
@andrross andrross merged commit 72e63f2 into opensearch-project:main Nov 22, 2023
29 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-10543-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 72e63f2b3e8257d204bedbc2d04e1aa25adaebf6
# Push it to GitHub
git push --set-upstream origin backport/backport-10543-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-10543-to-2.x.

jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Nov 29, 2023
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
(cherry picked from commit 72e63f2)
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Nov 29, 2023
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
(cherry picked from commit 72e63f2)
Signed-off-by: Ankit Jain <[email protected]>
msfroh pushed a commit that referenced this pull request Nov 30, 2023
…) (#11389)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test



* fixing checkstyle violations



* fixing existing tests



* adding test for delegating count to internal weight object



* Fixing failing unit tests



* Adding the change log



---------


(cherry picked from commit 72e63f2)

Signed-off-by: Niyati Aggarwal <[email protected]>
Signed-off-by: Ankit Jain <[email protected]>
Co-authored-by: Niyati Aggarwal <[email protected]>
fahadshamiinsta pushed a commit to fahadshamiinsta/OpenSearch270 that referenced this pull request Dec 4, 2023
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Dec 11, 2023
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…search-project#10543)

* adding delegation from CachingWeightWrapper#count to internal weight object and its unit test

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing checkstyle violations

Signed-off-by: Niyati Aggarwal <[email protected]>

* fixing existing tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* adding test for delegating count to internal weight object

Signed-off-by: Niyati Aggarwal <[email protected]>

* Fixing failing unit tests

Signed-off-by: Niyati Aggarwal <[email protected]>

* Adding the change log

Signed-off-by: Niyati Aggarwal <[email protected]>

---------

Signed-off-by: Niyati Aggarwal <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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 bug Something isn't working good first issue Good for newcomers Search Search query, autocomplete ...etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] IndicesQueryCache$CachingWeightWrapper#count should delegate to internal weight
5 participants