From 1fbd564b141b2dc5a45d7b80ac5a010610e3de15 Mon Sep 17 00:00:00 2001 From: Jiajun Wang Date: Sun, 22 Oct 2023 17:43:37 +1100 Subject: [PATCH 1/3] fix issue 100870 --- .../functionscore/ExponentialDecayFunctionBuilder.java | 6 ++---- .../query/functionscore/GaussDecayFunctionBuilder.java | 5 +---- .../query/functionscore/LinearDecayFunctionBuilder.java | 5 +---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java index 2c361fe025dfa..3e9308bc7cc3d 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java @@ -76,10 +76,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (super.equals(obj)) { - return true; - } - return obj != null && getClass() != obj.getClass(); + return obj == this || (obj != null && obj.getClass() == this.getClass()); } } @@ -88,3 +85,4 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ZERO; } } + diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java index 4415c87e9815e..1cc9335b5963e 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java @@ -83,10 +83,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (super.equals(obj)) { - return true; - } - return obj != null && getClass() != obj.getClass(); + return obj == this || (obj != null && obj.getClass() == this.getClass()); } } } diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java index ff22e1d57f832..70c3c4458a217 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java @@ -86,10 +86,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (super.equals(obj)) { - return true; - } - return obj != null && getClass() != obj.getClass(); + return obj == this || (obj != null && obj.getClass() == this.getClass()); } } } From 7b1014bda7530c53a337643358b26df3f8debc86 Mon Sep 17 00:00:00 2001 From: Jiajun Wang Date: Tue, 24 Oct 2023 13:35:31 +1100 Subject: [PATCH 2/3] fix issue 100870 --- .../query/functionscore/ExponentialDecayFunctionBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java index 3e9308bc7cc3d..ca6dfa5ef6e51 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java @@ -85,4 +85,3 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ZERO; } } - From 52a8d0a5a6730af5f2603583f6c9acff6b32784c Mon Sep 17 00:00:00 2001 From: Jiajun Wang Date: Sun, 29 Oct 2023 21:03:18 +1100 Subject: [PATCH 3/3] fix issue 100871 --- .../elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java index c36d73e8d12d6..dd8c334d2db61 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java @@ -160,7 +160,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState) @Override public int hashCode() { - return Objects.hash(super.hashCode(), ilmMode, slmMode); + return Objects.hash(ilmMode, slmMode); } @Override