Merge branch 'master' into proto-without-grpc

core/src/main/java/org/polypheny/db/docker/DockerManager.java

@@ -39,6 +39,10 @@
 import org.polypheny.db.docker.models.HandshakeInfo;
 import org.polypheny.db.docker.models.UpdateDockerResponse;
 import org.polypheny.db.util.RunMode;
+import org.polypheny.db.docker.models.DockerInstanceInfo;
+import org.polypheny.db.docker.models.HandshakeInfo;
+import org.polypheny.db.docker.models.UpdateDockerResponse;
+
 
 
 public final class DockerManager {

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

@@ -178,6 +178,19 @@ public String getDefault() {
     }
 
 
+    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/schema/Entity.java

@@ -110,14 +110,6 @@ default DataModel getNamespaceType() {
         return DataModel.RELATIONAL;
     }
 
-    interface Table {
-
-    }
-
-
-    interface Collection {
-
-    }
 
 }
 

core/src/main/java/org/polypheny/db/schema/types/ExtensibleEntity.java

@@ -27,8 +27,7 @@
  * <p>
  * If the entity implements extended interfaces such as
  * {@link ScannableEntity},
- * {@link FilterableEntity} or
- * {@link ProjectableFilterableEntity}
+ * {@link FilterableEntity}
  */
 public interface ExtensibleEntity extends Typed {
 

dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java

@@ -1072,8 +1072,6 @@ private PreparedResult<PolyValue> implement( AlgRoot root, AlgDataType parameter
         }
 
         final AlgDataType jdbcType = QueryProcessorHelpers.makeStruct( root.alg.getCluster().getTypeFactory(), root.validatedRowType );
-        //TODO DL: get metadata instead of null
-        List<List<String>> fieldOrigins = Collections.nCopies( jdbcType.getFieldCount(), null );
 
         final Prefer prefer = Prefer.ARRAY;
         final Convention resultConvention =
@@ -1119,7 +1117,7 @@ private PreparedResult<PolyValue> implement( AlgRoot root, AlgDataType parameter
         return new PreparedResultImpl<>(
                 resultType,
                 parameterRowType,
-                fieldOrigins,
+                Collections.nCopies( jdbcType.getFieldCount(), null ), // we do not have the origin of the fields so we provide null for all
                 root.collation.getFieldCollations().isEmpty()
                         ? ImmutableList.of()
                         : ImmutableList.of( root.collation ),

dbms/src/test/java/org/polypheny/db/jdbc/JdbcArrayTest.java

@@ -354,7 +354,6 @@ public void itemOperatorTest2() throws SQLException {
                     statement.executeUpdate( "DROP TABLE arraytest" );
                     connection.commit();
                 }
-
             }
         }
     }

dbms/src/test/java/org/polypheny/db/jdbc/JdbcMetaTest.java

@@ -16,7 +16,6 @@
 
 package org.polypheny.db.jdbc;
 
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

dbms/src/test/java/org/polypheny/db/jdbc/JdbcResultSetTest.java

@@ -26,11 +26,15 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.polypheny.db.PolyphenyDb;
 import org.polypheny.db.TestHelper.JdbcConnection;
 import org.polypheny.jdbc.PolyphenyResultSet;
 
+
+@Tag("adapter")
 public class JdbcResultSetTest {
 
     private static final String TABLE_SQL = "CREATE TABLE IF NOT EXISTS resultset_test (id INT PRIMARY KEY, hex_value VARCHAR(2))";

dbms/src/test/java/org/polypheny/db/jdbc/JdbcStatementTest.java

@@ -33,14 +33,15 @@
 import java.sql.Statement;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.polypheny.db.PolyphenyDb;
 import org.polypheny.db.TestHelper;
 import org.polypheny.db.TestHelper.JdbcConnection;
 import org.polypheny.jdbc.PolyphenyStatement;
 
 @Slf4j
-//@Category({ AdapterTestSuite.class, CassandraExcluded.class })
+@Tag("adapter")
 public class JdbcStatementTest {
 
     private static final String CREATE_TEST_TABLE = "CREATE TABLE IF NOT EXISTS my_table (id INT PRIMARY KEY, name VARCHAR(50))";

plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statements/Signaturizable.java

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+<<<<<<<< HEAD:plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statements/Signaturizable.java
 package org.polypheny.db.protointerface.statements;
 
 import java.util.List;
@@ -22,5 +23,13 @@
 public interface Signaturizable {
 
     List<ParameterMeta> getParameterMetas();
+========
+package org.polypheny.db.docker.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public record AutoDockerResult( @JsonProperty AutoDockerStatus status, @JsonProperty List<DockerInstanceInfo> instances ) {
+>>>>>>>> master:core/src/main/java/org/polypheny/db/docker/models/AutoDockerResult.java
 
 }

plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/Transport.java

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+<<<<<<<< HEAD:plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/Transport.java
 package org.polypheny.db.protointerface.transport;
 
 import java.io.Closeable;
@@ -29,5 +30,12 @@ public interface Transport extends Closeable {
     byte[] receiveMessage() throws IOException;
 
     void close();
+========
+package org.polypheny.db.docker.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record AutoDockerStatus( @JsonProperty boolean available, @JsonProperty boolean connected, @JsonProperty boolean running, @JsonProperty String status ) {
+>>>>>>>> master:core/src/main/java/org/polypheny/db/docker/models/AutoDockerStatus.java
 
 }