Use Objects.equals() instead of == to compare strings #77840
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: xingrufei <xingrufei@sogou-inc.com>
elasticsearchmachine
added
v8.0.0
external-contributor
pugnascotia
added
the
:Search/Search
|
Pinging @elastic/es-search (Team:Search) |
cbuescher
reviewed
Sep 16, 2021
There was a problem hiding this comment.
Hi @skyguard1, thanks for catching this. I left two very small asks, otherwise LGTM. I will go ahead and run our CI tests once you adressed those two comments.
| @@ -749,7 +749,7 @@ private GetAliasesRequest createGetAliasesRequest(FieldCapabilitiesResponse resp | |||
| } else { | |||
| // if the field type is the same across all this alias' indices, check the field's capabilities (searchable/aggregatable) | |||
| for (Entry<String, FieldCapabilities> type : types.entrySet()) { | |||
| if (type.getKey() == UNMAPPED) { | |||
| if (Objects.equals(type.getKey(), UNMAPPED)) { | |||
There was a problem hiding this comment.
There is another similar comparison in L713, would you mind correcting that as well?
| @@ -97,7 +97,7 @@ public void add(Term[] terms) { | |||
| */ | |||
| public void add(Term[] terms, int position) { | |||
| for (int i = 0; i < terms.length; i++) { | |||
| if (terms[i].field() != field) { | |||
| if (!Objects.equals(terms[i].field(), field)) { | |||
There was a problem hiding this comment.
small styling issue: we prefer to make negative statements more explicit by using "v == false" instead of "!v". Even though it is more verbose it helps readability. So in this case "Objects.equals(terms[i].field(), field) == false" would be preferable.
Signed-off-by: xingrufei <xingrufei@sogou-inc.com>
|
@elasticmachine test this please |
|
Not sure why the ci build failed. Maybe ci build can be triggered again? |
|
Pinging @elastic/es-ql (Team:QL) |
|
@elasticmachine run elasticsearch-ci/packaging-tests-windows-sample |
|
@elasticmachine update branch |
|
@elasticmachine test this please |
💚 Backport successful
|
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 16, 2021
wjp719
added a commit
to wjp719/elasticsearch
that referenced
this pull request
Sep 18, 2021
* master: (185 commits) Implement get and containsKey in terms of the wrapped innerMap (elastic#77965) Adjust Lucene version and enable BWC tests (elastic#77933) Disable BWC to upgrade to Lucene-8.10-snapshot Reenable MlDistributedFailureIT [DOCS] Fix typo for `script.painless.regex.enabled` setting value (elastic#77853) Upgrade to Lucene-8.10.0-snapshot-bf2fcb53079 (elastic#77801) [DOCS] Fix ESS install lead-in (elastic#77887) Resolve thirdparty gradle plugin artifacts from mavencentral (elastic#77865) Reduce the number of times that `LifecycleExecutionState` is parsed when running a policy. (elastic#77863) Utility methods to add and remove backing indices from data streams (elastic#77778) Use Objects.equals() instead of == to compare strings (elastic#77840) [ML] prefer least allocated model when a new node is added to the cluster (elastic#77756) Deprecate ignore_throttled parameter (elastic#77479) Improve LifecycleExecutionState parsing. (elastic#77855) [DOCS] Removes deprecated word from HLRC title. (elastic#77851) Remove legacy geo code from AggregationResultUtils (elastic#77702) Adjust SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache (elastic#77758) Laxify SecureSM to allow creation of the JDK's innocuous threads (elastic#77789) [Test] Reduce concurrency when testing creation of security index (elastic#75293) Refactor metric PipelineAggregation integration test (elastic#77548) ... # Conflicts: # server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use Objects.equals() instead of == to compare strings in
MultiPhrasePrefixQueryandIndexResolver, thanks