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

Compare strings with equals() instead of == #16461

Closed
wants to merge 68 commits into from

Conversation

dk2k
Copy link
Contributor

@dk2k dk2k commented Oct 23, 2024

Previous PR #16415

Signed-off-by: Dmitry Kryukov <[email protected]>
…rch-project#16111)

* Add support for restoring from snapshot with search replicas

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed PR comments

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed the issues in gradle precommit

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed flaky tests

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed precommit failure

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed the codecoverage for RestoreService

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Fixed precommit failure

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* removing unwanted tests

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Marc Handalian <[email protected]>
Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

---------

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>
Signed-off-by: Vinay Krishna Pudyodu <[email protected]>
Co-authored-by: Vinay Krishna Pudyodu <[email protected]>
Co-authored-by: Marc Handalian <[email protected]>
Copy link
Contributor

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

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

dependabot bot and others added 15 commits November 14, 2024 15:40
… /plugins/repository-gcs (opensearch-project#16504)

* Bump com.google.cloud:google-cloud-core-http in /plugins/repository-gcs

Bumps com.google.cloud:google-cloud-core-http from 2.23.0 to 2.47.0.

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-core-http
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: gaobinlong <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: gaobinlong <[email protected]>
…earch-project#16581)

* Support installing plugin SNAPSHOTs with SNASPHOT distribution

Signed-off-by: Andriy Redko <[email protected]>

* Use Build.CURRENT directly for snapshots

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
…#16533)

* Update DEVELOPER_GUIDE.md instructions for JDK-11

Signed-off-by: Andriy Redko <[email protected]>

* Address review comments

Signed-off-by: Andriy Redko <[email protected]>

* Update DEVELOPER_GUIDE.md

Co-authored-by: Andrew Ross <[email protected]>
Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
…tion to run under a parent filter aggregation (opensearch-project#16652)

Signed-off-by: Gao Binlong <[email protected]>
…ebuddy from 1.15.4 to 1.15.10 (opensearch-project#16655)

* Bump mockito from 5.14.1 to 5.14.2

Signed-off-by: Craig Perkins <[email protected]>

* Update objenesis from 3.2 to 3.3

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Update bytebuddy from 1.15.4 to 1.15.10

Signed-off-by: Craig Perkins <[email protected]>

* Update README

Signed-off-by: Craig Perkins <[email protected]>

* Add grant to mockito-core

Signed-off-by: Craig Perkins <[email protected]>

* Add perms

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
* search dv only ip masks

Signed-off-by: mikhail-khludnev <[email protected]>

* search dv only ip masks: changes

Signed-off-by: Mikhail Khludnev <[email protected]>

* drop fancy closures

Signed-off-by: mikhail-khludnev <[email protected]>

* drop fancy closures. one more

Signed-off-by: mikhail-khludnev <[email protected]>

* fix unit tests; add some more dvOnly

Signed-off-by: mikhail-khludnev <[email protected]>

* drop skipping dvOnly in 2.x

Signed-off-by: mikhail-khludnev <[email protected]>

* drop redundant brackets

Signed-off-by: mikhail-khludnev <[email protected]>

* extract conditions

Signed-off-by: mikhail-khludnev <[email protected]>

* asserts

Signed-off-by: mikhail-khludnev <[email protected]>

* spotless apply

Signed-off-by: mikhail-khludnev <[email protected]>

* bring back skip before

Signed-off-by: mikhail-khludnev <[email protected]>

* combine asserts

Signed-off-by: mikhail-khludnev <[email protected]>

* inline, copy-paste

Signed-off-by: mikhail-khludnev <[email protected]>

---------

Signed-off-by: mikhail-khludnev <[email protected]>
Signed-off-by: Mikhail Khludnev <[email protected]>
Co-authored-by: mikhail-khludnev <[email protected]>
…/fixtures/hdfs-fixture (opensearch-project#16665)

* Bump org.xerial.snappy:snappy-java in /test/fixtures/hdfs-fixture

Bumps [org.xerial.snappy:snappy-java](https://github.com/xerial/snappy-java) from 1.1.10.6 to 1.1.10.7.
- [Release notes](https://github.com/xerial/snappy-java/releases)
- [Commits](xerial/snappy-java@v1.1.10.6...v1.1.10.7)

---
updated-dependencies:
- dependency-name: org.xerial.snappy:snappy-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…16669)

Bumps com.gradle.develocity from 3.18.1 to 3.18.2.

---
updated-dependencies:
- dependency-name: com.gradle.develocity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump codecov/codecov-action from 4 to 5

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v4...v5)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…2.0.0 to v1-rev20241105-2.0.0 in /plugins/discovery-gce (opensearch-project#16613)

* Bump com.google.apis:google-api-services-compute

Bumps com.google.apis:google-api-services-compute from v1-rev20241021-2.0.0 to v1-rev20241105-2.0.0.

---
updated-dependencies:
- dependency-name: com.google.apis:google-api-services-compute
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
@@ -97,6 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix typo super->sb in method toString() of RemoteStoreNodeAttribute ([#15362](https://github.com/opensearch-project/OpenSearch/pull/15362))
- [Workload Management] Fixing Create/Update QueryGroup TransportActions to execute from non-cluster manager nodes ([16422](https://github.com/opensearch-project/OpenSearch/pull/16422))
- Fix flaky test in `testApproximateRangeWithSizeOverDefault` by adjusting totalHits assertion logic ([#16434](https://github.com/opensearch-project/OpenSearch/pull/16434#pullrequestreview-2386999409))
- Fix string equality comparisons ([#16461](https://github.com/opensearch-project/OpenSearch/pull/16461))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we dont need changelog for such changes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have it merged as is? I don't fancy creating one more PR after another unsuccessful rebase

Copy link
Member

@dblock dblock Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a conflict in CHANGELOG, gradle checks failed, and the diff looks big now :( Appreciate your help in rebasing this. I marked this PR skip-changelog so you can just revert that file.

…16682)

* Separating remote download and publication stats

Signed-off-by: Himshikha Gupta <[email protected]>
reta and others added 4 commits November 22, 2024 10:12
…rds are closed (opensearch-project#16560)

* added draft tests for tsc stats holder

Signed-off-by: Peter Alfonsi <[email protected]>

* first draft tsc stats bugfix

Signed-off-by: Peter Alfonsi <[email protected]>

* Complete tests

Signed-off-by: Peter Alfonsi <[email protected]>

* Cleanup

Signed-off-by: Peter Alfonsi <[email protected]>

* Integrate fix with TSC

Signed-off-by: Peter Alfonsi <[email protected]>

* Add IT

Signed-off-by: Peter Alfonsi <[email protected]>

* Refactor cache package names in TSC module to match with server

Signed-off-by: Peter Alfonsi <[email protected]>

* changelog

Signed-off-by: Peter Alfonsi <[email protected]>

* Revert "Refactor cache package names in TSC module to match with server"

This reverts commit 3b15a7a.

Signed-off-by: Peter Alfonsi <[email protected]>

* Addressed Sagar's comments

Signed-off-by: Peter Alfonsi <[email protected]>

* More package fixes

Signed-off-by: Peter Alfonsi <[email protected]>

* Addressed andross's comments

Signed-off-by: Peter Alfonsi <[email protected]>

---------

Signed-off-by: Peter Alfonsi <[email protected]>
Signed-off-by: Peter Alfonsi <[email protected]>
Co-authored-by: Peter Alfonsi <[email protected]>
…ng_comparison_fix

# Conflicts:
#	CHANGELOG.md
@dk2k dk2k requested a review from peternied as a code owner November 23, 2024 14:34
@dk2k
Copy link
Contributor Author

dk2k commented Nov 23, 2024

Rebase failed again. It sucks!

@dk2k dk2k closed this Nov 23, 2024
dk2k added a commit to dk2k/OpenSearch that referenced this pull request Nov 23, 2024
@dk2k
Copy link
Contributor Author

dk2k commented Nov 23, 2024

New PR #16714

Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.