added missing dependincies from merge

polypheny · Oct 8, 2023 · 3768948 · 3768948
1 parent bd84390
commit 3768948
Show file tree

Hide file tree

Showing 19 changed files with 240 additions and 255 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -54,14 +54,8 @@ dependencies {
     implementation group: "org.codehaus.janino", name: "commons-compiler", version: commons_compiler_version  // BSD
     implementation group: 'com.j256.simplemagic', name: 'simplemagic', version: simplemagic_version // ISC
 
-    api(group: "org.apache.calcite", name: "calcite-linq4j", version: calcite_linq4j_version) {
-        exclude(module: 'guava')
-        exclude(module: 'avatica-core')
-    } // Apache 2.0
-    api(group: "org.polypheny.avatica", name: "avatica-core", version: avatica_core_version) {
-        exclude(module: "protobuf-java")
-        exclude group: 'org.apache.calcite', module: 'avatica-core'
-    } // Apache 2.0
+    api group: "org.apache.calcite", name: "calcite-linq4j", version: calcite_linq4j_version // Apache 2.0
+    api group: "org.polypheny.avatica", name: "avatica-core", version: avatica_core_version // Apache 2.0
 
     implementation group: "com.drewnoakes", name: "metadata-extractor", version: metadata_extractor_version // Apache 2.0
 
@@ -88,13 +82,19 @@ dependencies {
     testImplementation group: "junit", name: "junit", version: junit_version
     testImplementation group: "org.hamcrest", name: "hamcrest-core", version: hamcrest_core_version
 
+}
 
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobuf_version"
+    }
+}
 
 
 sourceSets {
     main {
         java {
-            srcDirs = ["src/main/java","build/generated-sources"]
+            srcDirs = ["src/main/java", "build/generated-sources", "build/generated/source/proto/main/java"]
             outputDir = file(project.buildDir.absolutePath + "/classes")
         }
         resources {
@@ -126,11 +126,18 @@ compileJava {
     dependsOn("generateJdbcVersionProperties")
     dependsOn(":config:processResources")
     dependsOn(":information:processResources")
+    dependsOn("generateProto")
 }
 
 delombok {
     dependsOn(":config:processResources")
     dependsOn(":information:processResources")
+    dependsOn("generateProto")
+}
+
+extractIncludeProto {
+    dependsOn(":config:compileJava")
+    dependsOn(":information:compileJava")
 }
 
 

diff --git a/core/src/main/java/org/polypheny/db/PolyImplementation.java b/core/src/main/java/org/polypheny/db/PolyImplementation.java
@@ -230,14 +230,11 @@ public ResultIterator execute( Statement statement, int batch, boolean isAnalyze
     }
 
 
-
-
-
-    private Iterator<T> createIterator( Bindable<T> bindable, Statement statement, boolean isAnalyzed ) {
+    private Iterator<PolyValue[]> createIterator( Bindable<PolyValue[]> bindable, Statement statement, boolean isAnalyzed ) {
         if ( isAnalyzed ) {
             statement.getOverviewDuration().start( "Execution" );
         }
-        final Enumerable<T> enumerable = enumerable( bindable, statement.getDataContext() );
+        final Enumerable<PolyValue[]> enumerable = enumerable( bindable, statement.getDataContext() );
 
         if ( isAnalyzed ) {
             statement.getOverviewDuration().stop( "Execution" );

diff --git a/dbms/build.gradle b/dbms/build.gradle
@@ -44,7 +44,8 @@ dependencies {
     implementation group: "org.apache.logging.log4j", name: "log4j-slf4j-impl", version: log4j_slf4j_impl_version  // Apache 2.0
 
     ////// SLF4J
-    implementation group: 'org.pf4j', name: 'pf4j', version: pf4jVersion // Apache 2.0
+    implementation group: 'org.pf4j', name: 'pf4j', version: pf4j_version // Apache 2.0
+    implementation(group: "io.javalin", name: "javalin", version: javalin_version)// Apache 2.0
 
     implementation group: "com.github.rvesse", name: "airline", version: airline_version  // Apache 2.0
     implementation group: "com.github.oshi", name: "oshi-core", version: oshi_core_version  // MIT

diff --git a/dbms/src/main/java/org/polypheny/db/processing/DataMigratorImpl.java b/dbms/src/main/java/org/polypheny/db/processing/DataMigratorImpl.java
@@ -357,7 +357,7 @@ public void executeQuery( List<AllocationColumn> selectedColumns, AlgRoot source
 
             int batchSize = RuntimeConfig.DATA_MIGRATOR_BATCH_SIZE.getInteger();
             int i = 0;
-            ResultIterator<PolyValue> iter = result.execute( sourceStatement, batchSize );
+            ResultIterator iter = implementation.execute( sourceStatement, batchSize );
             do {
                 List<List<PolyValue>> rows = iter.getRows();
                 if ( rows.isEmpty() ) {
@@ -752,7 +752,7 @@ public void copyAllocationData( Transaction transaction, CatalogAdapter store, L
             }*/
 
             int batchSize = RuntimeConfig.DATA_MIGRATOR_BATCH_SIZE.getInteger();
-            ResultIterator<PolyValue> iter = result.execute( source.sourceStatement, batchSize );
+            ResultIterator iter = result.execute( source.sourceStatement, batchSize );
             do {
                 List<List<PolyValue>> rows = iter.getRows();//MetaImpl.collect( result.getCursorFactory(), LimitIterator.of( sourceIterator, batchSize ), new ArrayList<>() ).stream().map( r -> r.stream().map( e -> (PolyValue) e ).collect( Collectors.toList() ) ).collect( Collectors.toList() );