Make equals include ids for Alias, TypedAttribute

Author: alex-spies

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Alias.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import static java.util.Collections.singletonList;
 
@@ -147,4 +148,10 @@ public String nodeString() {
     public static Expression unwrap(Expression e) {
         return e instanceof Alias as ? as.child() : e;
     }
+
+    @Override
+    protected boolean innerEquals(Object o) {
+        var other = (Alias) o;
+        return super.innerEquals(other) && Objects.equals(id(), other.id());
+    }
 }

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypedAttribute.java

@@ -54,6 +54,6 @@ public int hashCode() {
     @Override
     protected boolean innerEquals(Object o) {
         var other = (TypedAttribute) o;
-        return super.innerEquals(other) && dataType == other.dataType;
+        return super.innerEquals(other) && Objects.equals(id(), other.id()) && dataType == other.dataType;
     }
 }