Improve collector insertion

polypheny · Dec 31, 2024 · 8d25a70 · 8d25a70
1 parent 994b645
commit 8d25a70
Show file tree

Hide file tree

Showing 20 changed files with 287 additions and 39 deletions.
diff --git a/core/src/main/java/org/polypheny/db/algebra/core/Exchange.java b/core/src/main/java/org/polypheny/db/algebra/core/Exchange.java
@@ -82,6 +82,9 @@ public final Exchange copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
         return copy( traitSet, sole( inputs ), distribution );
     }
 
+    public final Exchange copy(List<AlgNode> inputs ) {
+        return copy( traitSet, sole( inputs ), distribution );
+    }
 
     public abstract Exchange copy( AlgTraitSet traitSet, AlgNode newInput, AlgDistribution newDistribution );
 

diff --git a/core/src/main/java/org/polypheny/db/algebra/core/Match.java b/core/src/main/java/org/polypheny/db/algebra/core/Match.java
@@ -179,6 +179,7 @@ public AlgNode copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
     }
 
 
+
     @Override
     public AlgWriter explainTerms( AlgWriter pw ) {
         return super.explainTerms( pw )

diff --git a/core/src/main/java/org/polypheny/db/algebra/core/RelTableFunctionScan.java b/core/src/main/java/org/polypheny/db/algebra/core/RelTableFunctionScan.java
@@ -66,9 +66,9 @@
  */
 public abstract class RelTableFunctionScan extends AbstractAlgNode {
 
-    private final RexNode rexCall;
+    protected final RexNode rexCall;
 
-    private final Type elementType;
+    protected final Type elementType;
 
     private ImmutableList<AlgNode> inputs;
 

diff --git a/core/src/main/java/org/polypheny/db/algebra/core/SetOp.java b/core/src/main/java/org/polypheny/db/algebra/core/SetOp.java
@@ -93,6 +93,11 @@ public SetOp copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
     }
 
 
+    public SetOp copy( List<AlgNode> inputs ) {
+        return copy( traitSet, inputs, all );
+    }
+
+
     @Override
     public void replaceInput( int ordinalInParent, AlgNode p ) {
         final List<AlgNode> newInputs = new ArrayList<>( inputs );
@@ -145,6 +150,7 @@ public boolean isHomogeneous( boolean compareNames ) {
         return true;
     }
 
+
     @Override
     public boolean isDataModifying() {
         return false;

diff --git a/core/src/main/java/org/polypheny/db/algebra/core/Sort.java b/core/src/main/java/org/polypheny/db/algebra/core/Sort.java
@@ -130,6 +130,9 @@ public final Sort copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
         return copy( traitSet, sole( inputs ), collation, fieldExps, offset, fetch );
     }
 
+    public final Sort copy( List<AlgNode> inputs ) {
+        return copy( traitSet, sole( inputs ), collation, fieldExps, offset, fetch );
+    }
 
     public abstract Sort copy( AlgTraitSet traitSet, AlgNode newInput, AlgCollation newCollation, ImmutableList<RexNode> fieldExps, RexNode offset, RexNode fetch );
 

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/common/LogicalConditionalExecute.java b/core/src/main/java/org/polypheny/db/algebra/logical/common/LogicalConditionalExecute.java
@@ -84,4 +84,21 @@ public AlgNode copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
         return lce;
     }
 
+    public AlgNode copy( List<AlgNode> inputs ) {
+        final LogicalConditionalExecute lce = new LogicalConditionalExecute(
+                inputs.get( 0 ).getCluster(),
+                traitSet,
+                inputs.get( 0 ),
+                inputs.get( 1 ),
+                condition,
+                exceptionClass,
+                exceptionMessage );
+        lce.setCheckDescription( checkDescription );
+        lce.setLogicalNamespace( logicalNamespace );
+        lce.setCatalogTable( catalogTable );
+        lce.setCatalogColumns( catalogColumns );
+        lce.setValues( values );
+        return lce;
+    }
+
 }
diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/common/LogicalConstraintEnforcer.java b/core/src/main/java/org/polypheny/db/algebra/logical/common/LogicalConstraintEnforcer.java
@@ -393,6 +393,16 @@ public AlgNode copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
                 this.getExceptionMessages() );
     }
 
+    public AlgNode copy( List<AlgNode> inputs ) {
+        return new LogicalConstraintEnforcer(
+                inputs.get( 0 ).getCluster(),
+                traitSet,
+                inputs.get( 0 ),
+                inputs.get( 1 ),
+                this.getExceptionClasses(),
+                this.getExceptionMessages() );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/document/LogicalDocIdCollector.java b/core/src/main/java/org/polypheny/db/algebra/logical/document/LogicalDocIdCollector.java
@@ -35,7 +35,7 @@ protected LogicalDocIdCollector( AlgCluster cluster, AlgTraitSet traits, Transac
     }
 
 
-    public static LogicalDocIdCollector create( Transaction transaction, Entity entity, final AlgNode input ) {
+    public static LogicalDocIdCollector create( final AlgNode input, Transaction transaction, Entity entity ) {
         final AlgCluster cluster = input.getCluster();
         final AlgTraitSet traits = input.getTraitSet();
         return new LogicalDocIdCollector( cluster, traits, transaction, entity, input );

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/lpg/LogicalLpgIdCollector.java b/core/src/main/java/org/polypheny/db/algebra/logical/lpg/LogicalLpgIdCollector.java
@@ -35,7 +35,7 @@ protected LogicalLpgIdCollector( AlgCluster cluster, AlgTraitSet traits, Transac
     }
 
 
-    public static LogicalLpgIdCollector create( Transaction transaction, Entity entity, final AlgNode input ) {
+    public static LogicalLpgIdCollector create(  final AlgNode input, Transaction transaction, Entity entity ) {
         final AlgCluster cluster = input.getCluster();
         final AlgTraitSet traits = input.getTraitSet();
         return new LogicalLpgIdCollector( cluster, traits, transaction, entity, input );

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelAggregate.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelAggregate.java
@@ -104,6 +104,11 @@ public LogicalRelAggregate copy( AlgTraitSet traitSet, AlgNode input, boolean in
         return new LogicalRelAggregate( getCluster(), traitSet, input, indicator, groupSet, groupSets, aggCalls );
     }
 
+    public LogicalRelAggregate copy( AlgNode input) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelAggregate( getCluster(), traitSet, input, indicator, groupSet, groupSets, aggCalls );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelCorrelate.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelCorrelate.java
@@ -126,6 +126,13 @@ public LogicalRelCorrelate copy(
         return new LogicalRelCorrelate( getCluster(), traitSet, left, right, correlationId, requiredColumns, joinType );
     }
 
+    public LogicalRelCorrelate copy(
+            AlgNode left,
+            AlgNode right) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelCorrelate( getCluster(), traitSet, left, right, correlationId, requiredColumns, joinType );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java
@@ -108,6 +108,11 @@ public LogicalRelFilter copy( AlgTraitSet traitSet, AlgNode input, RexNode condi
         return new LogicalRelFilter( getCluster(), traitSet, input, condition, variablesSet );
     }
 
+    public LogicalRelFilter copy( AlgNode input) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelFilter( getCluster(), traitSet, input, condition, variablesSet );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelIntersect.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelIntersect.java
@@ -74,6 +74,10 @@ public LogicalRelIntersect copy( AlgTraitSet traitSet, List<AlgNode> inputs, boo
         return new LogicalRelIntersect( getCluster(), traitSet, inputs, all );
     }
 
+    public LogicalRelIntersect copy(List<AlgNode> inputs) {
+        return new LogicalRelIntersect( getCluster(), traitSet, inputs, all );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java
@@ -122,6 +122,11 @@ public LogicalRelJoin copy( AlgTraitSet traitSet, RexNode conditionExpr, AlgNode
         return new LogicalRelJoin( getCluster(), getCluster().traitSetOf( Convention.NONE ).replace( ModelTrait.RELATIONAL ), left, right, conditionExpr, variablesSet, joinType, semiJoinDone );
     }
 
+    public LogicalRelJoin copy( AlgNode left, AlgNode right) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelJoin( getCluster(), getCluster().traitSetOf( Convention.NONE ).replace( ModelTrait.RELATIONAL ), left, right, condition, variablesSet, joinType, semiJoinDone );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelMatch.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelMatch.java
@@ -100,6 +100,11 @@ public Match copy(
         return new LogicalRelMatch( getCluster(), traitSet, input, rowType, pattern, strictStart, strictEnd, patternDefinitions, measures, after, subsets, allRows, partitionKeys, orderKeys, interval );
     }
 
+    public Match copy( AlgNode input ) {
+        final AlgTraitSet traitSet = getCluster().traitSetOf( Convention.NONE );
+        return new LogicalRelMatch( getCluster(), traitSet, input, rowType, pattern, strictStart, strictEnd, patternDefinitions, measures, after, subsets, allRows, partitionKeys, orderKeys, interval );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelModify.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelModify.java
@@ -86,6 +86,12 @@ public LogicalRelModify copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
     }
 
 
+    public LogicalRelModify copy( List<AlgNode> inputs ) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return (LogicalRelModify) new LogicalRelModify( getCluster(), traitSet, entity, sole( inputs ), getOperation(), getUpdateColumns(), getSourceExpressions(), isFlattened() ).streamed( streamed );
+    }
+
+
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {
         return shuttle.visit( this );

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelProject.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelProject.java
@@ -119,6 +119,11 @@ public LogicalRelProject copy( AlgTraitSet traitSet, AlgNode input, List<RexNode
     }
 
 
+    public LogicalRelProject copy( AlgNode input ) {
+        return new LogicalRelProject( getCluster(), traitSet, input, exps, rowType );
+    }
+
+
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {
         return shuttle.visit( this );

diff --git a/...rc/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelTableFunctionScan.java b/...rc/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelTableFunctionScan.java
@@ -86,6 +86,11 @@ public LogicalRelTableFunctionScan copy( AlgTraitSet traitSet, List<AlgNode> inp
         return new LogicalRelTableFunctionScan( getCluster(), traitSet, inputs, rexCall, elementType, rowType, columnMappings );
     }
 
+    public LogicalRelTableFunctionScan copy( List<AlgNode> inputs) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelTableFunctionScan( getCluster(), traitSet, inputs, rexCall, elementType, rowType, columnMappings );
+    }
+
 
     @Override
     public AlgOptCost computeSelfCost( AlgPlanner planner, AlgMetadataQuery mq ) {

diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelUnion.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelUnion.java
@@ -84,6 +84,11 @@ public LogicalRelUnion copy( AlgTraitSet traitSet, List<AlgNode> inputs, boolean
         return new LogicalRelUnion( getCluster(), traitSet, inputs, all );
     }
 
+    public LogicalRelUnion copy( List<AlgNode> inputs) {
+        assert traitSet.containsIfApplicable( Convention.NONE );
+        return new LogicalRelUnion( getCluster(), traitSet, inputs, all );
+    }
+
 
     @Override
     public AlgNode accept( AlgShuttle shuttle ) {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         @Override
         public AlgWriter explainTerms( AlgWriter pw ) {
             return super.explainTerms( pw )
@@ Expand Down @@