[v1] Add equals and hashcode for AST classes

partiql · Oct 22, 2024 · 34a0993 · 34a0993
1 parent 4fa3853
commit 34a0993
Show file tree

Hide file tree

Showing 74 changed files with 468 additions and 4 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/DataType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/DataType.java
@@ -1,5 +1,8 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = false)
 public class DataType implements Enum {
     public static final int UNKNOWN = 0;
     // <absent types>
@@ -158,6 +161,14 @@ public static DataType DEC() {
         return new DataType(DEC);
     }
 
+    public static DataType DEC(int precision) {
+        return new DataType(DEC, precision, null, null);
+    }
+
+    public static DataType DEC(int precision, int scale) {
+        return new DataType(DEC, precision, scale, null);
+    }
+
     public static DataType NUMERIC() {
         return new DataType(NUMERIC);
     }

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/DatetimeField.java b/partiql-ast/src/main/java/org/partiql/ast/v1/DatetimeField.java
@@ -1,8 +1,11 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
 /**
  * TODO docs, equals, hashcode
  */
+@EqualsAndHashCode(callSuper = false)
 public class DatetimeField implements Enum {
     public static final int UNKNOWN = 0;
     public static final int YEAR = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -11,6 +12,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class Exclude extends AstNode {
     @NotNull
     public final List<ExcludePath> excludePaths;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.ast.v1.expr.ExprVarRef;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class ExcludePath extends AstNode {
     @NotNull
     public final ExprVarRef root;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.value.PartiQLValue;
 
@@ -13,6 +14,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class Explain extends Statement {
     // TODO get rid of PartiQLValue once https://github.com/partiql/partiql-lang-kotlin/issues/1589 is resolved
     @NotNull

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/From.java b/partiql-ast/src/main/java/org/partiql/ast/v1/From.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -11,6 +12,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class From extends AstNode {
     @NotNull
     public final List<FromTableRef> tableRefs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.v1.expr.Expr;
@@ -13,6 +14,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class FromExpr extends FromTableRef {
     @NotNull
     public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.v1.expr.Expr;
@@ -13,6 +14,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class FromJoin extends FromTableRef {
     @NotNull
     public final From lhs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromType.java
@@ -1,8 +1,11 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
 /**
  * TODO docs, equals, hashcode
  */
+@EqualsAndHashCode(callSuper = false)
 public class FromType implements Enum {
     public static final int UNKNOWN = 0;
     public static final int SCAN = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.v1.expr.Expr;
@@ -13,6 +14,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class GroupBy extends AstNode {
     @NotNull
     public final GroupByStrategy strategy;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/GroupByStrategy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/GroupByStrategy.java
@@ -1,8 +1,11 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
 /**
  * TODO docs, equals, hashcode
  */
+@EqualsAndHashCode(callSuper = false)
 public class GroupByStrategy implements Enum {
     public static final int UNKNOWN = 0;
     public static final int FULL = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -10,6 +11,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class Identifier extends AstNode {
     @NotNull
     public final String symbol;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class IdentifierChain extends AstNode {
     @NotNull
     public final Identifier root;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/JoinType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/JoinType.java
@@ -1,8 +1,11 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
 /**
  * TODO docs, equals, hashcode
  */
+@EqualsAndHashCode(callSuper = false)
 public class JoinType implements Enum {
     public static final int UNKNOWN = 0;
     public static final int INNER = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.ast.v1.expr.Expr;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class Let extends AstNode {
     @NotNull
     public final List<Binding> bindings;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Nulls.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Nulls.java
@@ -1,8 +1,11 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
 /**
  * TODO docs, equals, hashcode
  */
+@EqualsAndHashCode(callSuper = false)
 public class Nulls implements Enum {
     public static final int UNKNOWN = 0;
     public static final int FIRST = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Order.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Order.java
@@ -1,5 +1,8 @@
 package org.partiql.ast.v1;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = false)
 public class Order implements Enum {
     public static final int UNKNOWN = 0;
     public static final int ASC = 1;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -11,6 +12,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class OrderBy extends AstNode {
     @NotNull
     public final List<Sort> sorts;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.ast.v1.expr.Expr;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class Query extends Statement {
     @NotNull
     public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java b/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.v1.expr.Expr;
@@ -11,6 +12,7 @@
 
 public abstract class QueryBody extends AstNode {
     @Builder(builderClassName = "Builder")
+    @EqualsAndHashCode(callSuper = false)
     public static class SFW extends QueryBody {
         @NotNull
         public final Select select;
@@ -65,6 +67,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     }
 
     @Builder(builderClassName = "Builder")
+    @EqualsAndHashCode(callSuper = false)
     public static class SetOp extends QueryBody {
         @NotNull
         public final org.partiql.ast.v1.SetOp type;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,6 +28,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
      * TODO docs, equals, hashcode
      */
     @Builder(builderClassName = "Builder")
+    @EqualsAndHashCode(callSuper = false)
     public static class Star extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;
@@ -53,6 +55,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
      * TODO docs, equals, hashcode
      */
     @Builder(builderClassName = "Builder")
+    @EqualsAndHashCode(callSuper = false)
     public static class Expr extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class SelectList extends Select {
     @NotNull
     public final List<SelectItem> items;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.ast.v1.expr.Expr;
 
@@ -12,6 +13,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class SelectPivot extends Select {
     @NotNull
     public final Expr key;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,6 +12,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class SelectStar extends Select {
     @Nullable
     public final SetQuantifier setq;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java
@@ -1,6 +1,7 @@
 package org.partiql.ast.v1;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.v1.expr.Expr;
@@ -13,6 +14,7 @@
  * TODO docs, equals, hashcode
  */
 @Builder(builderClassName = "Builder")
+@EqualsAndHashCode(callSuper = false)
 public class SelectValue extends Select {
     @NotNull
     public final Expr constructor;