fix: shard id serialization equals and hashCode

salvatore-campagna · Jul 14, 2023 · 7b8fb9b · 7b8fb9b
1 parent 77a53d2
commit 7b8fb9b
Showing 1 changed file with 35 additions and 3 deletions.
diff --git a/...plugin/rollup/src/main/java/org/elasticsearch/xpack/downsample/RollupShardTaskParams.java b/...plugin/rollup/src/main/java/org/elasticsearch/xpack/downsample/RollupShardTaskParams.java
@@ -20,6 +20,8 @@
 import org.elasticsearch.xpack.core.rollup.action.RollupShardTask;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Objects;
 
 public record RollupShardTaskParams(
     DownsampleConfig downsampleConfig,
@@ -68,7 +70,7 @@ public record RollupShardTaskParams(
             in.readString(),
             in.readVLong(),
             in.readVLong(),
-            ShardId.fromString(in.readString()),
+            new ShardId(in),
             in.readStringArray(),
             in.readStringArray()
         );
@@ -81,7 +83,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(ROLLUP_INDEX.getPreferredName(), rollupIndex);
         builder.field(INDEX_START_TIME_MILLIS.getPreferredName(), indexStartTimeMillis);
         builder.field(INDEX_END_TIME_MILLIS.getPreferredName(), indexEndTimeMillis);
-        builder.field(SHARD_ID.getPreferredName(), shardId.toString());
+        builder.field(SHARD_ID.getPreferredName(), shardId);
         builder.array(METRICS.getPreferredName(), metrics);
         builder.array(LABELS.getPreferredName(), labels);
         return builder.endObject();
@@ -103,7 +105,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(rollupIndex);
         out.writeVLong(indexStartTimeMillis);
         out.writeLong(indexEndTimeMillis);
-        out.writeString(shardId.toString());
+        shardId.writeTo(out);
         out.writeStringArray(metrics);
         out.writeStringArray(labels);
     }
@@ -123,4 +125,34 @@ public static RollupShardTaskParams readFromStream(final StreamInput in) throws
     public static RollupShardTaskParams fromXContent(XContentParser parser) {
         return PARSER.apply(parser, null);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        RollupShardTaskParams that = (RollupShardTaskParams) o;
+        return indexStartTimeMillis == that.indexStartTimeMillis
+            && indexEndTimeMillis == that.indexEndTimeMillis
+            && Objects.equals(downsampleConfig, that.downsampleConfig)
+            && Objects.equals(rollupIndex, that.rollupIndex)
+            && Objects.equals(shardId.id(), that.shardId.id())
+            && Objects.equals(shardId.getIndexName(), that.shardId.getIndexName())
+            && Arrays.equals(metrics, that.metrics)
+            && Arrays.equals(labels, that.labels);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(
+            downsampleConfig,
+            rollupIndex,
+            indexStartTimeMillis,
+            indexEndTimeMillis,
+            shardId.id(),
+            shardId.getIndexName()
+        );
+        result = 31 * result + Arrays.hashCode(metrics);
+        result = 31 * result + Arrays.hashCode(labels);
+        return result;
+    }
 }