Speedup equals

idegtiarenko · idegtiarenko · commit 9c008f110665 · 2025-04-07T13:32:26.000+02:00
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Attribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Attribute.java
@@ -118,12 +118,14 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (super.equals(obj)) {
-            Attribute other = (Attribute) obj;
-            return Objects.equals(nullability, other.nullability);
+        if (this == obj) {
+            return true;
         }
-
-        return false;
+        if (obj == null || getClass() != obj.getClass() || super.equals(obj) == false) {
+            return false;
+        }
+        Attribute other = (Attribute) obj;
+        return Objects.equals(nullability, other.nullability);
     }
 
     @Override
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/EmptyAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/EmptyAttribute.java
@@ -69,11 +69,9 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-
         if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-
         return true;
     }
 }
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/EntryExpression.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/EntryExpression.java
@@ -99,7 +99,6 @@ public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-
         EntryExpression other = (EntryExpression) obj;
         return Objects.equals(key, other.key) && Objects.equals(value, other.value);
     }
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java
@@ -223,15 +223,20 @@ public Attribute withDataType(DataType type) {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), parentName, field);
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
+            return false;
+        }
+        FieldAttribute that = (FieldAttribute) o;
+        return Objects.equals(parentName, that.parentName) && Objects.equals(field, that.field);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj)
-            && Objects.equals(parentName, ((FieldAttribute) obj).parentName)
-            && Objects.equals(field, ((FieldAttribute) obj).field);
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), parentName, field);
     }
 
     @Override
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/MetadataAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/MetadataAttribute.java
@@ -173,12 +173,15 @@ public static boolean isSupported(String name) {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (false == super.equals(obj)) {
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
             return false;
         }
-        MetadataAttribute other = (MetadataAttribute) obj;
-        return searchable == other.searchable;
+        MetadataAttribute that = (MetadataAttribute) o;
+        return searchable == that.searchable;
     }
 
     @Override
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/NamedExpression.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/NamedExpression.java
@@ -69,9 +69,8 @@ public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-
         NamedExpression other = (NamedExpression) obj;
-        return Objects.equals(synthetic, other.synthetic)
+        return synthetic == other.synthetic
             /*
              * It is important that the line below be `name`
              * and not `name()` because subclasses might override
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypedAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypedAttribute.java
@@ -34,12 +34,19 @@ public DataType dataType() {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), dataType);
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
+            return false;
+        }
+        TypedAttribute that = (TypedAttribute) o;
+        return dataType == that.dataType;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj) && Objects.equals(dataType, ((TypedAttribute) obj).dataType);
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), dataType);
     }
 }
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/UnresolvedAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/UnresolvedAttribute.java
@@ -119,16 +119,21 @@ public static String errorMessage(String name, List<String> potentialMatches) {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), resolutionMetadata, unresolvedMsg);
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
+            return false;
+        }
+        UnresolvedAttribute that = (UnresolvedAttribute) o;
+        return customMessage == that.customMessage
+            && Objects.equals(unresolvedMsg, that.unresolvedMsg)
+            && Objects.equals(resolutionMetadata, that.resolutionMetadata);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (super.equals(obj)) {
-            UnresolvedAttribute ua = (UnresolvedAttribute) obj;
-            return Objects.equals(resolutionMetadata, ua.resolutionMetadata) && Objects.equals(unresolvedMsg, ua.unresolvedMsg);
-        }
-        return false;
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), resolutionMetadata, unresolvedMsg);
     }
 }
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/UnresolvedStar.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/UnresolvedStar.java
@@ -70,10 +70,12 @@ public boolean equals(Object obj) {
          * to ignore it in equals for the transform
          * tests to pass.
          */
+        if (this == obj) {
+            return true;
+        }
         if (obj == null || obj.getClass() != getClass()) {
             return false;
         }
-
         UnresolvedStar other = (UnresolvedStar) obj;
         return Objects.equals(qualifier, other.qualifier);
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/UnresolvedNamePattern.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/UnresolvedNamePattern.java
@@ -98,17 +98,20 @@ public Nullability nullable() {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), pattern);
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
+            return false;
+        }
+        UnresolvedNamePattern that = (UnresolvedNamePattern) o;
+        return Objects.equals(pattern, that.pattern);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (super.equals(obj)) {
-            UnresolvedNamePattern ua = (UnresolvedNamePattern) obj;
-            return Objects.equals(pattern, ua.pattern);
-        }
-        return false;
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), pattern);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/UnsupportedAttribute.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/UnsupportedAttribute.java
@@ -163,17 +163,20 @@ public boolean hasCustomMessage() {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), hasCustomMessage, message);
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass() || super.equals(o) == false) {
+            return false;
+        }
+        UnsupportedAttribute that = (UnsupportedAttribute) o;
+        return hasCustomMessage == that.hasCustomMessage && Objects.equals(message, that.message);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (super.equals(obj)) {
-            var ua = (UnsupportedAttribute) obj;
-            return Objects.equals(hasCustomMessage, ua.hasCustomMessage) && Objects.equals(message, ua.message);
-        }
-        return false;
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), message, hasCustomMessage);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,9 @@ public boolean equals(Object obj) {`
`69`	`69`	`if (this == obj) {`
`70`	`70`	`return true;`
`71`	`71`	`}`
`72`		`-`
`73`	`72`	`if (obj == null \|\| getClass() != obj.getClass()) {`
`74`	`73`	`return false;`
`75`	`74`	`}`
`76`		`-`
`77`	`75`	`return true;`
`78`	`76`	`}`
`79`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ public boolean equals(Object obj) {`
`99`	`99`	`if (obj == null \|\| getClass() != obj.getClass()) {`
`100`	`100`	`return false;`
`101`	`101`	`}`
`102`		`-`
`103`	`102`	`EntryExpression other = (EntryExpression) obj;`
`104`	`103`	`return Objects.equals(key, other.key) && Objects.equals(value, other.value);`
`105`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,15 @@ public static boolean isSupported(String name) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`@Override`
`176`		`- public boolean equals(Object obj) {`
`177`		`- if (false == super.equals(obj)) {`
	`176`	`+ public boolean equals(Object o) {`
	`177`	`+ if (this == o) {`
	`178`	`+ return true;`
	`179`	`+ }`
	`180`	`+ if (o == null \|\| getClass() != o.getClass() \|\| super.equals(o) == false) {`
`178`	`181`	`return false;`
`179`	`182`	`}`
`180`		`- MetadataAttribute other = (MetadataAttribute) obj;`
`181`		`- return searchable == other.searchable;`
	`183`	`+ MetadataAttribute that = (MetadataAttribute) o;`
	`184`	`+ return searchable == that.searchable;`
`182`	`185`	`}`
`183`	`186`
`184`	`187`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,19 @@ public DataType dataType() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public int hashCode() {`
`38`		`- return Objects.hash(super.hashCode(), dataType);`
	`37`	`+ public boolean equals(Object o) {`
	`38`	`+ if (this == o) {`
	`39`	`+ return true;`
	`40`	`+ }`
	`41`	`+ if (o == null \|\| getClass() != o.getClass() \|\| super.equals(o) == false) {`
	`42`	`+ return false;`
	`43`	`+ }`
	`44`	`+ TypedAttribute that = (TypedAttribute) o;`
	`45`	`+ return dataType == that.dataType;`
`39`	`46`	`}`
`40`	`47`
`41`	`48`	`@Override`
`42`		`- public boolean equals(Object obj) {`
`43`		`- return super.equals(obj) && Objects.equals(dataType, ((TypedAttribute) obj).dataType);`
	`49`	`+ public int hashCode() {`
	`50`	`+ return Objects.hash(super.hashCode(), dataType);`
`44`	`51`	`}`
`45`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,12 @@ public boolean equals(Object obj) {`
`70`	`70`	`* to ignore it in equals for the transform`
`71`	`71`	`* tests to pass.`
`72`	`72`	`*/`
	`73`	`+ if (this == obj) {`
	`74`	`+ return true;`
	`75`	`+ }`
`73`	`76`	`if (obj == null \|\| obj.getClass() != getClass()) {`
`74`	`77`	`return false;`
`75`	`78`	`}`
`76`		`-`
`77`	`79`	`UnresolvedStar other = (UnresolvedStar) obj;`
`78`	`80`	`return Objects.equals(qualifier, other.qualifier);`
`79`	`81`	`}`