removing old catalogReader inheritant classes and old tests

core/src/main/java/org/polypheny/db/algebra/core/relational/RelationalTransformable.java

@@ -22,7 +22,6 @@
 import org.polypheny.db.algebra.core.common.Modify.Operation;
 import org.polypheny.db.catalog.entity.LogicalEntity;
 import org.polypheny.db.catalog.snapshot.Snapshot;
-import org.polypheny.db.prepare.Prepare.CatalogReader;
 import org.polypheny.db.schema.types.ModifiableTable;
 
 
@@ -31,10 +30,6 @@
  */
 public interface RelationalTransformable {
 
-    default CatalogReader getCatalogReader() {
-        throw new UnsupportedOperationException();
-    }
-
 
     List<AlgNode> getRelationalEquivalent( List<AlgNode> values, List<LogicalEntity> entities, Snapshot snapshot );
 

core/src/main/java/org/polypheny/db/algebra/fun/AggFunction.java

@@ -18,7 +18,7 @@
 
 import org.polypheny.db.algebra.constant.Kind;
 import org.polypheny.db.nodes.Function;
-import org.polypheny.db.schema.Wrapper;
+import org.polypheny.db.util.Wrapper;
 
 public interface AggFunction extends Function, Wrapper {
 

core/src/main/java/org/polypheny/db/catalog/catalogs/AllocationCatalog.java

@@ -24,7 +24,7 @@
 import org.polypheny.db.catalog.impl.allocation.PolyAllocDocCatalog;
 import org.polypheny.db.catalog.impl.allocation.PolyAllocGraphCatalog;
 import org.polypheny.db.catalog.impl.allocation.PolyAllocRelCatalog;
-import org.polypheny.db.schema.Wrapper;
+import org.polypheny.db.util.Wrapper;
 
 @SerializeClass(subclasses = { PolyAllocDocCatalog.class, PolyAllocGraphCatalog.class, PolyAllocRelCatalog.class })
 public interface AllocationCatalog extends Wrapper {

core/src/main/java/org/polypheny/db/catalog/entity/LogicalEntity.java

@@ -37,10 +37,10 @@
 import org.polypheny.db.catalog.refactor.CatalogType;
 import org.polypheny.db.schema.Statistic;
 import org.polypheny.db.schema.Statistics;
-import org.polypheny.db.schema.Wrapper;
 import org.polypheny.db.schema.types.Expressible;
 import org.polypheny.db.schema.types.Typed;
 import org.polypheny.db.util.ImmutableBitSet;
+import org.polypheny.db.util.Wrapper;
 
 @Getter
 @SuperBuilder(toBuilder = true)

core/src/main/java/org/polypheny/db/languages/NodeToAlgConverter.java

@@ -47,8 +47,6 @@ static ConfigBuilder configBuilder() {
         return new ConfigBuilder();
     }
 
-    void setDynamicParamCountInExplain( int explainParamCount );
-
     AlgNode flattenTypes( AlgNode rootAlg, boolean restructure );
 
     AlgNode decorrelate( Node query, AlgNode rootAlg );

core/src/main/java/org/polypheny/db/nodes/validate/ValidatorCatalogReader.java

@@ -22,8 +22,8 @@
 import org.polypheny.db.catalog.entity.logical.LogicalTable;
 import org.polypheny.db.catalog.snapshot.Snapshot;
 import org.polypheny.db.nodes.Identifier;
-import org.polypheny.db.schema.Wrapper;
 import org.polypheny.db.util.Moniker;
+import org.polypheny.db.util.Wrapper;
 
 
 /**

core/src/main/java/org/polypheny/db/nodes/validate/ValidatorTable.java

@@ -23,7 +23,7 @@
 import org.polypheny.db.algebra.constant.Monotonicity;
 import org.polypheny.db.algebra.type.AlgDataType;
 import org.polypheny.db.catalog.entity.logical.LogicalTable;
-import org.polypheny.db.schema.Wrapper;
+import org.polypheny.db.util.Wrapper;
 
 
 /**

core/src/main/java/org/polypheny/db/plan/AbstractRelOptPlanner.java → core/src/main/java/org/polypheny/db/plan/AbstractAlgOptPlanner.java

@@ -59,7 +59,7 @@
 /**
  * Abstract base for implementations of the {@link AlgOptPlanner} interface.
  */
-public abstract class AbstractRelOptPlanner implements AlgOptPlanner {
+public abstract class AbstractAlgOptPlanner implements AlgOptPlanner {
 
     /**
      * Regular expression for integer.
@@ -95,7 +95,7 @@ public abstract class AbstractRelOptPlanner implements AlgOptPlanner {
     /**
      * Creates an AbstractRelOptPlanner.
      */
-    protected AbstractRelOptPlanner( AlgOptCostFactory costFactory, Context context ) {
+    protected AbstractAlgOptPlanner( AlgOptCostFactory costFactory, Context context ) {
         assert costFactory != null;
         this.costFactory = costFactory;
         if ( context == null ) {

core/src/main/java/org/polypheny/db/plan/AlgOptQuery.java

@@ -37,53 +37,30 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.polypheny.db.algebra.AlgNode;
-import org.polypheny.db.algebra.core.CorrelationId;
 
 
 /**
  * A <code>AlgOptQuery</code> represents a set of {@link AlgNode relational expressions} which derive from the same <code>select</code> statement.
  */
 public class AlgOptQuery {
 
-    /**
-     * Prefix to the name of correlating variables.
-     */
-    public static final String CORREL_PREFIX = CorrelationId.CORREL_PREFIX;
-
 
     /**
      * Maps name of correlating variable (e.g. "$cor3") to the {@link AlgNode} which implements it.
      */
-    final Map<String, AlgNode> mapCorrelToRel;
+    final Map<String, AlgNode> mapCorrelToAlg;
 
-    private final AlgOptPlanner planner;
     final AtomicInteger nextCorrel;
 
 
     /**
      * For use by RelOptCluster only.
      */
-    AlgOptQuery( AlgOptPlanner planner, AtomicInteger nextCorrel, Map<String, AlgNode> mapCorrelToRel ) {
-        this.planner = planner;
+    AlgOptQuery( AtomicInteger nextCorrel, Map<String, AlgNode> mapCorrelToAlg ) {
         this.nextCorrel = nextCorrel;
-        this.mapCorrelToRel = mapCorrelToRel;
-    }
-
-
-    /**
-     * Returns the relational expression which populates a correlating variable.
-     */
-    public AlgNode lookupCorrel( String name ) {
-        return mapCorrelToRel.get( name );
+        this.mapCorrelToAlg = mapCorrelToAlg;
     }
 
 
-    /**
-     * Maps a correlating variable to a {@link AlgNode}.
-     */
-    public void mapCorrel( String name, AlgNode alg ) {
-        mapCorrelToRel.put( name, alg );
-    }
-
 }
 

core/src/main/java/org/polypheny/db/plan/AlgOptSchema.java

@@ -34,24 +34,9 @@
 package org.polypheny.db.plan;
 
 
-import java.util.List;
-import org.polypheny.db.catalog.entity.logical.LogicalTable;
-
-
 /**
- * A <code>RelOptSchema</code> is a set of {@link AlgOptEntity} objects.
+ * A <code>RelOptSchema</code> is a set of objects.
  */
 public interface AlgOptSchema {
 
-    /**
-     * Retrieves a {@link AlgOptEntity} based upon a member access.
-     *
-     * For example, the Saffron expression <code>salesSchema.emps</code> would be resolved using a call to <code>salesSchema.getTableForMember(new String[]{"emps" })</code>.
-     *
-     * Note that name.length is only greater than 1 for queries originating from JDBC.
-     *
-     * @param names Qualified name
-     */
-    LogicalTable getTableForMember( List<String> names );
-
 }

core/src/main/java/org/polypheny/db/plan/Context.java

@@ -34,7 +34,7 @@
 package org.polypheny.db.plan;
 
 
-import org.polypheny.db.schema.Wrapper;
+import org.polypheny.db.util.Wrapper;
 
 
 /**

core/src/main/java/org/polypheny/db/plan/hep/HepPlanner.java

@@ -54,7 +54,7 @@
 import org.polypheny.db.algebra.core.AlgFactories;
 import org.polypheny.db.algebra.metadata.AlgMetadataProvider;
 import org.polypheny.db.algebra.metadata.AlgMetadataQuery;
-import org.polypheny.db.plan.AbstractRelOptPlanner;
+import org.polypheny.db.plan.AbstractAlgOptPlanner;
 import org.polypheny.db.plan.AlgOptCost;
 import org.polypheny.db.plan.AlgOptCostFactory;
 import org.polypheny.db.plan.AlgOptCostImpl;
@@ -81,7 +81,7 @@
 /**
  * HepPlanner is a heuristic implementation of the {@link AlgOptPlanner} interface.
  */
-public class HepPlanner extends AbstractRelOptPlanner {
+public class HepPlanner extends AbstractAlgOptPlanner {
 
     private final HepProgram mainProgram;
 
@@ -151,7 +151,7 @@ public HepPlanner( HepProgram program, Context context, boolean noDag, Function2
     // implement RelOptPlanner
     @Override
     public void setRoot( AlgNode alg ) {
-        root = addRelToGraph( alg );
+        root = addAlgToGraph( alg );
         dumpGraph();
     }
 
@@ -686,7 +686,7 @@ private HepAlgVertex applyTransformationResults( HepAlgVertex vertex, HepRuleCal
             parents.add( parent );
         }
 
-        HepAlgVertex newVertex = addRelToGraph( bestRel );
+        HepAlgVertex newVertex = addAlgToGraph( bestRel );
 
         // There's a chance that newVertex is the same as one of the parents due to common subexpression recognition (e.g. the LogicalProject added by JoinCommuteRule).  In that
         // case, treat the transformation as a nop to avoid creating a loop.
@@ -734,7 +734,7 @@ public boolean isRegistered( AlgNode alg ) {
     }
 
 
-    private HepAlgVertex addRelToGraph( AlgNode alg ) {
+    private HepAlgVertex addAlgToGraph( AlgNode alg ) {
         // Check if a transformation already produced a reference to an existing vertex.
         if ( graph.vertexSet().contains( alg ) ) {
             return (HepAlgVertex) alg;
@@ -744,7 +744,7 @@ private HepAlgVertex addRelToGraph( AlgNode alg ) {
         final List<AlgNode> inputs = alg.getInputs();
         final List<AlgNode> newInputs = new ArrayList<>();
         for ( AlgNode input1 : inputs ) {
-            HepAlgVertex childVertex = addRelToGraph( input1 );
+            HepAlgVertex childVertex = addAlgToGraph( input1 );
             newInputs.add( childVertex );
         }
 

core/src/main/java/org/polypheny/db/plan/volcano/VolcanoPlanner.java

@@ -82,7 +82,7 @@
 import org.polypheny.db.algebra.rules.UnionToDistinctRule;
 import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.config.RuntimeConfig;
-import org.polypheny.db.plan.AbstractRelOptPlanner;
+import org.polypheny.db.plan.AbstractAlgOptPlanner;
 import org.polypheny.db.plan.AlgOptCost;
 import org.polypheny.db.plan.AlgOptCostFactory;
 import org.polypheny.db.plan.AlgOptListener;
@@ -108,7 +108,7 @@
  * VolcanoPlanner optimizes queries by transforming expressions selectively according to a dynamic programming algorithm.
  */
 @Slf4j
-public class VolcanoPlanner extends AbstractRelOptPlanner {
+public class VolcanoPlanner extends AbstractAlgOptPlanner {
 
     protected static final double COST_IMPROVEMENT = .5;