Flatten class hierarchy for IR JSON-path nodes

Abstract classes `IrAccessor` and `IrMethod` are removed.
trinodb · Apr 21, 2023 · 1be256c · 1be256c
1 parent 0b0ff96
commit 1be256c
Show file tree

Hide file tree

Showing 15 changed files with 155 additions and 124 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrAbsMethod.java
@@ -19,18 +19,29 @@
 
 import java.util.Optional;
 
+import static java.util.Objects.requireNonNull;
+
 public class IrAbsMethod
-        extends IrMethod
+        extends IrPathNode
 {
+    private final IrPathNode base;
+
     @JsonCreator
     public IrAbsMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "abs() method base is null");
     }
 
     @Override
     protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrAbsMethod(this, context);
     }
+
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrAccessor.java
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrArrayAccessor.java
@@ -23,15 +23,18 @@
 import static java.util.Objects.requireNonNull;
 
 public class IrArrayAccessor
-        extends IrAccessor
+        extends IrPathNode
 {
+    private final IrPathNode base;
+
     // list of subscripts or empty list for wildcard array accessor
     private final List<Subscript> subscripts;
 
     @JsonCreator
     public IrArrayAccessor(@JsonProperty("base") IrPathNode base, @JsonProperty("subscripts") List<Subscript> subscripts, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "array accessor base is null");
         this.subscripts = requireNonNull(subscripts, "subscripts is null");
     }
 
@@ -41,6 +44,12 @@ protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
         return visitor.visitIrArrayAccessor(this, context);
     }
 
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
+
     @JsonProperty
     public List<Subscript> getSubscripts()
     {

diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrCeilingMethod.java
@@ -19,18 +19,29 @@
 
 import java.util.Optional;
 
+import static java.util.Objects.requireNonNull;
+
 public class IrCeilingMethod
-        extends IrMethod
+        extends IrPathNode
 {
+    private final IrPathNode base;
+
     @JsonCreator
     public IrCeilingMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "ceiling() method base is null");
     }
 
     @Override
     protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrCeilingMethod(this, context);
     }
+
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDatetimeMethod.java
@@ -22,14 +22,16 @@
 import static java.util.Objects.requireNonNull;
 
 public class IrDatetimeMethod
-        extends IrMethod
+        extends IrPathNode
 {
+    private final IrPathNode base;
     private final Optional<String> format; // this is a string literal
 
     @JsonCreator
     public IrDatetimeMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("format") Optional<String> format, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "datetime() method base is null");
         this.format = requireNonNull(format, "format is null");
     }
 
@@ -39,6 +41,12 @@ protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
         return visitor.visitIrDatetimeMethod(this, context);
     }
 
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
+
     @JsonProperty
     public Optional<String> getFormat()
     {

diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDescendantMemberAccessor.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDescendantMemberAccessor.java
@@ -22,14 +22,16 @@
 import static java.util.Objects.requireNonNull;
 
 public class IrDescendantMemberAccessor
-        extends IrAccessor
+        extends IrPathNode
 {
+    private final IrPathNode base;
     private final String key;
 
     @JsonCreator
     public IrDescendantMemberAccessor(@JsonProperty("base") IrPathNode base, @JsonProperty("key") String key, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "descendant member accessor base is null");
         this.key = requireNonNull(key, "key is null");
     }
 
@@ -39,6 +41,12 @@ protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
         return visitor.visitIrDescendantMemberAccessor(this, context);
     }
 
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
+
     @JsonProperty
     public String getKey()
     {

diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrDoubleMethod.java
@@ -19,18 +19,29 @@
 
 import java.util.Optional;
 
+import static java.util.Objects.requireNonNull;
+
 public class IrDoubleMethod
-        extends IrMethod
+        extends IrPathNode
 {
+    private final IrPathNode base;
+
     @JsonCreator
     public IrDoubleMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "double() method base is null");
     }
 
     @Override
     protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrDoubleMethod(this, context);
     }
+
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
 }
diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java b/core/trino-main/src/main/java/io/trino/json/ir/IrFilter.java
@@ -22,14 +22,16 @@
 import static java.util.Objects.requireNonNull;
 
 public class IrFilter
-        extends IrAccessor
+        extends IrPathNode
 {
+    private final IrPathNode base;
     private final IrPredicate predicate;
 
     @JsonCreator
     public IrFilter(@JsonProperty("base") IrPathNode base, @JsonProperty("predicate") IrPredicate predicate, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "filter base is null");
         this.predicate = requireNonNull(predicate, "predicate is null");
     }
 
@@ -39,6 +41,12 @@ protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
         return visitor.visitIrFilter(this, context);
     }
 
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
+
     @JsonProperty
     public IrPredicate getPredicate()
     {

diff --git a/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java b/core/trino-main/src/main/java/io/trino/json/ir/IrFloorMethod.java
@@ -19,18 +19,29 @@
 
 import java.util.Optional;
 
+import static java.util.Objects.requireNonNull;
+
 public class IrFloorMethod
-        extends IrMethod
+        extends IrPathNode
 {
+    private final IrPathNode base;
+
     @JsonCreator
     public IrFloorMethod(@JsonProperty("base") IrPathNode base, @JsonProperty("type") Optional<Type> type)
     {
-        super(base, type);
+        super(type);
+        this.base = requireNonNull(base, "floor() method base is null");
     }
 
     @Override
     protected <R, C> R accept(IrJsonPathVisitor<R, C> visitor, C context)
     {
         return visitor.visitIrFloorMethod(this, context);
     }
+
+    @JsonProperty
+    public IrPathNode getBase()
+    {
+        return base;
+    }
 }