Proto Query Interface

core/src/main/java/org/polypheny/db/algebra/AlgProducingVisitor.java

@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.apache.calcite.linq4j.function.Function2;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -84,38 +83,6 @@ default void handle( AlgNode visitable ) {
     }
 
 
-    interface AlgProducingVisitor2<Return, Param1> {
-
-        default Return handle( AlgNode visitable, Param1 param1 ) {
-            Function2<AlgNode, Param1, Return> handler = findHandler( visitable.getClass() );
-            if ( handler != null ) {
-                return handler.apply( visitable, param1 );
-            }
-
-            return getDefaultHandler().apply( visitable, param1 );
-        }
-
-
-        default @Nullable Function2<AlgNode, Param1, Return> findHandler( Class<?> clazz ) {
-            while ( clazz != null && clazz != AlgNode.class ) {
-                if ( getHandlers().containsKey( clazz ) ) {
-                    return getHandlers().get( clazz );
-                }
-                clazz = clazz.getSuperclass();
-            }
-
-            return null;
-        }
-
-
-        ImmutableMap<Class<? extends AlgNode>, Function2<AlgNode, Param1, Return>> getHandlers();
-
-
-        Function2<AlgNode, Param1, Return> getDefaultHandler();
-
-    }
-
-
     interface AlgProducingVisitor3<Return, Param1, Param2> {
 
         default Return handle( AlgNode visitable, Param1 param1, Param2 param2 ) {

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableInterpreter.java

@@ -53,8 +53,7 @@
 /**
  * Relational expression that executes its children using an interpreter.
  * <p>
- * Although quite a few kinds of {@link AlgNode} can be interpreted, this is only created by default for {@link org.polypheny.db.schema.types.FilterableEntity} and
- * {@link org.polypheny.db.schema.types.ProjectableFilterableEntity}.
+ * Although quite a few kinds of {@link AlgNode} can be interpreted, this is only created by default for {@link org.polypheny.db.schema.types.FilterableEntity}.
  */
 public class EnumerableInterpreter extends SingleAlg implements EnumerableAlg {
 

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableScan.java

@@ -64,7 +64,6 @@
 import org.polypheny.db.plan.AlgTraitSet;
 import org.polypheny.db.plan.volcano.VolcanoCost;
 import org.polypheny.db.schema.types.FilterableEntity;
-import org.polypheny.db.schema.types.ProjectableFilterableEntity;
 import org.polypheny.db.schema.types.QueryableEntity;
 import org.polypheny.db.schema.types.ScannableEntity;
 import org.polypheny.db.schema.types.StreamableEntity;
@@ -138,7 +137,6 @@ public static Class<?> deduceElementType( PhysicalTable entity ) {
             }
         } else if ( entity instanceof ScannableEntity
                 || entity instanceof FilterableEntity
-                || entity instanceof ProjectableFilterableEntity
                 || entity instanceof StreamableEntity ) {
             return Object[].class;
         } else {
@@ -177,8 +175,7 @@ private Expression toRows( PhysType physType, Expression expression ) {
                 && Object[].class.isAssignableFrom( elementType )
                 && getTupleType().getFieldCount() == 1
                 && (entity.unwrap( ScannableEntity.class ).isPresent()
-                || entity.unwrap( FilterableEntity.class ).isPresent()
-                || entity.unwrap( ProjectableFilterableEntity.class ).isPresent()) ) {
+                || entity.unwrap( FilterableEntity.class ).isPresent()) ) {
             return Expressions.call( BuiltInMethod.SLICE0.method, expression );
         }
         JavaTupleFormat oldFormat = format();

core/src/main/java/org/polypheny/db/algebra/rules/AllocationToPhysicalModifyRule.java

@@ -24,8 +24,8 @@
 import org.polypheny.db.algebra.logical.document.LogicalDocumentModify;
 import org.polypheny.db.algebra.logical.lpg.LogicalLpgModify;
 import org.polypheny.db.algebra.logical.relational.LogicalRelModify;
+import org.polypheny.db.catalog.CatalogType.State;
 import org.polypheny.db.catalog.entity.allocation.AllocationEntity;
-import org.polypheny.db.catalog.refactor.CatalogType.State;
 import org.polypheny.db.plan.AlgOptRule;
 import org.polypheny.db.plan.AlgOptRuleCall;
 import org.polypheny.db.plan.Convention;

core/src/main/java/org/polypheny/db/algebra/rules/FilterScanRule.java

@@ -46,7 +46,6 @@
 import org.polypheny.db.rex.RexNode;
 import org.polypheny.db.rex.RexUtil;
 import org.polypheny.db.schema.types.FilterableEntity;
-import org.polypheny.db.schema.types.ProjectableFilterableEntity;
 import org.polypheny.db.tools.AlgBuilderFactory;
 import org.polypheny.db.util.mapping.Mapping;
 import org.polypheny.db.util.mapping.Mappings;
@@ -57,12 +56,10 @@
  * a {@link Filter}
  * on a {@link RelScan}
  * of a {@link FilterableEntity}
- * or a {@link ProjectableFilterableEntity}
  * to a {@link BindableScan}.
  *
  * The {@link #INTERPRETER} variant allows an intervening {@link EnumerableInterpreter}.
  *
- * @see ProjectScanRule
  */
 public abstract class FilterScanRule extends AlgOptRule {
 
@@ -115,15 +112,14 @@ protected FilterScanRule( AlgOptRuleOperand operand, AlgBuilderFactory algBuilde
 
     public static boolean test( RelScan<?> scan ) {
         // We can only push filters into a FilterableTable or ProjectableFilterableTable.
-        return scan.entity.unwrap( FilterableEntity.class ).isPresent() || scan.entity.unwrap( ProjectableFilterableEntity.class ).isPresent();
+        return scan.entity.unwrap( FilterableEntity.class ).isPresent();
     }
 
 
     protected void apply( AlgOptRuleCall call, Filter filter, RelScan<?> scan ) {
         final ImmutableList<Integer> projects;
         final ImmutableList.Builder<RexNode> filters = ImmutableList.builder();
-        if ( scan instanceof BindableScan ) {
-            final BindableScan bindableScan = (BindableScan) scan;
+        if ( scan instanceof BindableScan bindableScan ) {
             filters.addAll( bindableScan.filters );
             projects = bindableScan.projects;
         } else {

core/src/main/java/org/polypheny/db/catalog/refactor/CatalogType.java → core/src/main/java/org/polypheny/db/catalog/CatalogType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polypheny.db.catalog.refactor;
+package org.polypheny.db.catalog;
 
 public interface CatalogType {
 

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

@@ -31,9 +31,9 @@
 import org.polypheny.db.algebra.type.AlgDataTypeFactory;
 import org.polypheny.db.algebra.type.DocumentType;
 import org.polypheny.db.algebra.type.GraphType;
+import org.polypheny.db.catalog.CatalogType;
 import org.polypheny.db.catalog.logistic.DataModel;
 import org.polypheny.db.catalog.logistic.EntityType;
-import org.polypheny.db.catalog.refactor.CatalogType;
 import org.polypheny.db.schema.Statistic;
 import org.polypheny.db.schema.Statistics;
 import org.polypheny.db.schema.types.Expressible;

core/src/main/java/org/polypheny/db/iface/QueryInterface.java

@@ -155,6 +155,19 @@ public QueryInterfaceSettingInteger( String name, boolean canBeNull, boolean req
     }
 
 
+    public static class QueryInterfaceSettingLong extends QueryInterfaceSetting {
+
+        public final Long defaultValue;
+
+
+        public QueryInterfaceSettingLong( String name, boolean canBeNull, boolean required, boolean modifiable, Long defaultValue ) {
+            super( name, canBeNull, required, modifiable );
+            this.defaultValue = defaultValue;
+        }
+
+    }
+
+
     public static class QueryInterfaceSettingString extends QueryInterfaceSetting {
 
         public final String defaultValue;

core/src/main/java/org/polypheny/db/interpreter/Bindables.java

@@ -89,7 +89,6 @@
 import org.polypheny.db.rex.RexLiteral;
 import org.polypheny.db.rex.RexNode;
 import org.polypheny.db.schema.types.FilterableEntity;
-import org.polypheny.db.schema.types.ProjectableFilterableEntity;
 import org.polypheny.db.schema.types.ScannableEntity;
 import org.polypheny.db.tools.AlgBuilderFactory;
 import org.polypheny.db.type.entity.PolyValue;
@@ -269,8 +268,7 @@ public String algCompareString() {
 
         public static boolean canHandle( Entity entity ) {
             return entity.unwrap( ScannableEntity.class ).isPresent()
-                    || entity.unwrap( FilterableEntity.class ).isPresent()
-                    || entity.unwrap( ProjectableFilterableEntity.class ).isPresent();
+                    || entity.unwrap( FilterableEntity.class ).isPresent();
         }
 
 

core/src/main/java/org/polypheny/db/interpreter/Interpreter.java

@@ -65,7 +65,6 @@
 import org.polypheny.db.algebra.AlgVisitor;
 import org.polypheny.db.algebra.rules.CalcSplitRule;
 import org.polypheny.db.algebra.rules.FilterScanRule;
-import org.polypheny.db.algebra.rules.ProjectScanRule;
 import org.polypheny.db.algebra.type.AlgDataType;
 import org.polypheny.db.algebra.type.AlgDataTypeFactory.Builder;
 import org.polypheny.db.config.RuntimeConfig;
@@ -111,8 +110,6 @@ private AlgNode optimize( AlgNode rootAlg ) {
                         .addRuleInstance( CalcSplitRule.INSTANCE )
                         .addRuleInstance( FilterScanRule.INSTANCE )
                         .addRuleInstance( FilterScanRule.INTERPRETER )
-                        .addRuleInstance( ProjectScanRule.INSTANCE )
-                        .addRuleInstance( ProjectScanRule.INTERPRETER )
                         .build();
         final HepPlanner planner = new HepPlanner( hepProgram );
         planner.setRoot( rootAlg );