Repository: kylin
Updated Branches:
refs/heads/yang22 5ef2480c0 -> 7564274c3
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 4f42913..988c4c6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -68,10 +68,10 @@
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
- <!-- jackson is already packaged into calcite-avatica.jar.
To avoid including jackson
- twice, we include calcite-avatica which has jackson and exclude
jackson. -->
<excludes>
- <exclude>com.fasterxml.jackson.core:*</exclude>
+ <exclude>com.google.protobuf:*</exclude>
+ <exclude>commons-logging:*</exclude>
+ <exclude>commons-codec:*</exclude>
</excludes>
</artifactSet>
<relocations>
@@ -87,10 +87,6 @@
<pattern>org.apache.http</pattern>
<shadedPattern>${shadeBase}.org.apache.http</shadedPattern>
</relocation>
- <relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern>
- </relocation>
</relocations>
<filters>
<filter>
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java
index a1b9aef..8e69e68 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java
@@ -209,7 +209,7 @@ public class KylinMeta extends MetaImpl {
} catch (NoSuchFieldException e) {
throw new RuntimeException(e);
}
- columns.add(columnMetaData(name, index, field.getType()));
+ columns.add(columnMetaData(name, index, field.getType(), true));
fields.add(field);
fieldNames.add(fieldName);
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/kylin-it/pom.xml
----------------------------------------------------------------------
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 86f2544..b901137 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -40,6 +40,12 @@
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>atopcalcite</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>avatica-core</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
@@ -71,14 +77,6 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-query</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-linq4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<!-- Env & Test -->
@@ -300,7 +298,9 @@
<argument>-DuseSandbox=true</argument>
<argument>-Dhdp.version=${hdp.version}</argument>
<argument>-DfastBuildMode=${fastBuildMode}</argument>
- <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument>
+ <argument>
+ -Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties
+ </argument>
<argument>-classpath</argument>
<classpath/>
<argument>org.apache.kylin.provision.BuildCubeWithEngine</argument>
@@ -322,7 +322,9 @@
<argument>-DuseSandbox=true</argument>
<argument>-Dhdp.version=${hdp.version}</argument>
<argument>-DfastBuildMode=${fastBuildMode}</argument>
- <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument>
+ <argument>
+ -Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties
+ </argument>
<argument>-classpath</argument>
<classpath/>
<argument>org.apache.kylin.provision.BuildCubeWithStream</argument>
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
index 2f8991b..99b73a9 100644
--- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
@@ -21,6 +21,7 @@ package org.apache.kylin.jdbc;
import java.io.File;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.Driver;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51479c8..8b2e0aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,8 @@
<aspectj.version>1.8.9</aspectj.version>
<!-- Calcite Version -->
- <calcite.version>1.8.0</calcite.version>
+ <calcite.version>1.11.0</calcite.version>
+ <avatica.version>1.9.0</avatica.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -456,8 +457,7 @@
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica</artifactId>
- <version>${calcite.version}</version>
-
+ <version>${avatica.version}</version>
</dependency>
<!-- Workaround for hive 0.14 avatica dependency -->
<dependency>
http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index c51812d..badf214 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -41,16 +41,18 @@
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>atopcalcite</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-storage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
|