equals and hashcode

not-napoleon · not-napoleon · commit c7dfe134b4c2 · 2025-07-17T11:47:50.000-04:00
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/EsField.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/EsField.java
@@ -300,12 +300,13 @@ public boolean equals(Object o) {
             && isAlias == field.isAlias
             && esDataType == field.esDataType
             && Objects.equals(name, field.name)
-            && Objects.equals(properties, field.properties);
+            && Objects.equals(properties, field.properties)
+            && Objects.equals(timeSeriesFieldType, field.timeSeriesFieldType);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(esDataType, aggregatable, properties, name, isAlias);
+        return Objects.hash(esDataType, aggregatable, properties, name, isAlias, timeSeriesFieldType);
     }
 
     public static final class Exact {

Original file line number	Diff line number	Diff line change
`@@ -300,12 +300,13 @@ public boolean equals(Object o) {`
`300`	`300`	`&& isAlias == field.isAlias`
`301`	`301`	`&& esDataType == field.esDataType`
`302`	`302`	`&& Objects.equals(name, field.name)`
`303`		`- && Objects.equals(properties, field.properties);`
	`303`	`+ && Objects.equals(properties, field.properties)`
	`304`	`+ && Objects.equals(timeSeriesFieldType, field.timeSeriesFieldType);`
`304`	`305`	`}`
`305`	`306`
`306`	`307`	`@Override`
`307`	`308`	`public int hashCode() {`
`308`		`- return Objects.hash(esDataType, aggregatable, properties, name, isAlias);`
	`309`	`+ return Objects.hash(esDataType, aggregatable, properties, name, isAlias, timeSeriesFieldType);`
`309`	`310`	`}`
`310`	`311`
`311`	`312`	`public static final class Exact {`