updated proto files to support go

.gitignore

@@ -220,7 +220,7 @@ nbdist/
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !/gradle/wrapper/gradle-wrapper.jar
 
-/geode-adapter/vf.gf.server.status.cmd
+/geode-adapterTemplate/vf.gf.server.status.cmd
 /core/custom-namespace-model.json
 /testTestCsv/**
 !/libs/avatica-1.16.0-POLYPHENYDB-shaded.jar

build.gradle

@@ -13,7 +13,6 @@ buildscript {
     }
 }
 
-
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.5.31"
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.1"

core/build.gradle

@@ -71,8 +71,10 @@ dependencies {
     api group: 'io.activej', name: 'activej-serializer', version: activej_serializer_version // Apache 2.0
 
     // --- Test Compile ---
+    // https://mvnrepository.com/artifact/org.mockito/mockito-core
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.4.0'
     testImplementation group: "junit", name: "junit", version: junit_version
-    testImplementation group: "org.hamcrest", name: "hamcrest-core", version: hamcrest_core_version  // BSD 3-clause
+    testImplementation group: "org.hamcrest", name: "hamcrest-core", version: hamcrest_core_version
 
 
 }

core/src/main/java/org/polypheny/db/PolyImplementation.java

@@ -78,10 +78,6 @@ public class PolyImplementation<T> {
 
     @Accessors(fluent = true)
     private final boolean isDDL;
-    private Iterator<T> iterator;
-    private boolean isOpen;
-    private StatementEvent statementEvent;
-    private int batch;
 
 
     /**
@@ -177,13 +173,6 @@ public Bindable<T> getBindable() {
     }
 
 
-    public boolean hasMoreRows() {
-        if ( iterator == null ) {
-            throw new GenericRuntimeException( "Implementation was not opened" );
-        }
-        return iterator.hasNext();
-    }
-
     public List<ColumnMetaData> getColumns() {
         if ( columns != null ) {
             return columns;
@@ -240,10 +229,6 @@ public ResultIterator<T> execute( Statement statement, int batch, boolean isAnal
 
 
     private Iterator<T> createIterator( Bindable<T> bindable, Statement statement, boolean isAnalyzed ) {
-        if ( iterator != null ) {
-            return this.iterator;
-        }
-
         if ( isAnalyzed ) {
             statement.getOverviewDuration().start( "Execution" );
         }
@@ -253,9 +238,7 @@ private Iterator<T> createIterator( Bindable<T> bindable, Statement statement, b
             statement.getOverviewDuration().stop( "Execution" );
         }
 
-        this.iterator = enumerable.iterator();
-
-        return this.iterator;
+        return enumerable.iterator();
     }
 
 
@@ -388,6 +371,10 @@ private ResultIterator( Iterator<T> iterator, Statement statement, int batch, bo
 
 
         public List<List<T>> getRows() {
+            return getRows(batch);
+        }
+
+        public List<List<T>> getRows(int rowCount) {
 
             StopWatch stopWatch = null;
             try {
@@ -397,7 +384,7 @@ public List<List<T>> getRows() {
                 }
                 List<List<T>> res = new ArrayList<>();
                 int i = 0;
-                while ( i++ < batch && iterator.hasNext() ) {
+                while ( i++ < rowCount && iterator.hasNext() ) {
                     res.add( List.of( (T[]) iterator.next() ) );
                 }
 
@@ -478,6 +465,11 @@ public void close() throws Exception {
             }
         }
 
+
+        public boolean hasMoreRows() {
+            return iterator.hasNext();
+        }
+
     }
 
 

core/src/main/java/org/polypheny/db/algebra/enumerable/document/EnumerableDocumentFilter.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019-2023 The Polypheny Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.polypheny.db.algebra.enumerable.document;
+
+import org.polypheny.db.algebra.AlgNode;
+import org.polypheny.db.algebra.core.document.DocumentFilter;
+import org.polypheny.db.algebra.enumerable.EnumerableAlg;
+import org.polypheny.db.algebra.enumerable.EnumerableAlgImplementor;
+import org.polypheny.db.plan.AlgOptCluster;
+import org.polypheny.db.plan.AlgTraitSet;
+import org.polypheny.db.rex.RexNode;
+import org.polypheny.db.schema.trait.ModelTrait;
+
+public class EnumerableDocumentFilter extends DocumentFilter implements EnumerableAlg {
+
+    /**
+     * Creates a {@link DocumentFilter}.
+     * {@link ModelTrait#DOCUMENT} native node of a filter.
+     *
+     * @param cluster
+     * @param traits
+     * @param input
+     * @param condition
+     */
+    protected EnumerableDocumentFilter( AlgOptCluster cluster, AlgTraitSet traits, AlgNode input, RexNode condition ) {
+        super( cluster, traits, input, condition );
+    }
+
+
+    @Override
+    protected AlgNode copy( AlgTraitSet traitSet, AlgNode input, RexNode condition ) {
+        return null;
+    }
+
+
+    @Override
+    public Result implement( EnumerableAlgImplementor implementor, Prefer pref ) {
+        return null;
+    }
+
+}

core/src/main/java/org/polypheny/db/algebra/enumerable/document/EnumerableDocumentFilterRule.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019-2023 The Polypheny Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.polypheny.db.algebra.enumerable.document;
+
+import org.polypheny.db.algebra.AlgNode;
+import org.polypheny.db.algebra.convert.ConverterRule;
+import org.polypheny.db.algebra.enumerable.EnumerableConvention;
+import org.polypheny.db.algebra.logical.document.LogicalDocumentFilter;
+
+public class EnumerableDocumentFilterRule extends ConverterRule {
+
+    public EnumerableDocumentFilterRule() {
+        super( LogicalDocumentFilter.class, EnumerableConvention.NONE, EnumerableConvention.INSTANCE, "EnumerableDocumentFilterRule" );
+    }
+
+
+    @Override
+    public AlgNode convert( AlgNode alg ) {
+        LogicalDocumentFilter filter = (LogicalDocumentFilter) alg;
+
+        return new EnumerableDocumentFilter(
+                filter.getCluster(),
+                filter.getTraitSet().replace( EnumerableConvention.INSTANCE ),
+                filter.getInput(),
+                filter.condition );
+    }
+
+}

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

@@ -94,7 +94,9 @@ private static AlgNode handleDocumentEntity( AlgOptRuleCall call, Scan<?> scan,
 
     private AlgNode handleRelationalEntity( AlgOptRuleCall call, Scan<?> scan, AllocationEntity alloc ) {
         AlgNode alg = AdapterManager.getInstance().getAdapter( alloc.adapterId ).getRelScan( alloc.id, call.builder() );
-        alg = attachReorder( alg, scan, call.builder() );
+        if ( scan.getModel() == scan.entity.namespaceType ) {
+            alg = attachReorder( alg, scan, call.builder() );
+        }
 
         if ( scan.getModel() != scan.entity.namespaceType ) {
             // cross-model queries need a transformer first, we let another rule handle that

core/src/main/java/org/polypheny/db/algebra/stream/StreamRules.java

@@ -55,6 +55,7 @@
 import org.polypheny.db.algebra.logical.relational.LogicalSort;
 import org.polypheny.db.algebra.logical.relational.LogicalUnion;
 import org.polypheny.db.catalog.entity.logical.LogicalTable;
+import org.polypheny.db.catalog.entity.physical.PhysicalTable;
 import org.polypheny.db.plan.AlgOptCluster;
 import org.polypheny.db.plan.AlgOptRule;
 import org.polypheny.db.plan.AlgOptRuleCall;