You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/06/18 09:31:17 UTC
[04/13] incubator-kylin git commit: KYLIN-780 Update calcite 1.0.0 in
pom
KYLIN-780 Update calcite 1.0.0 in pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/650f81a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/650f81a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/650f81a3
Branch: refs/heads/KYLIN-780
Commit: 650f81a30f704ae2f5d3bd492f86c3bf89648966
Parents: 49ce391
Author: Yang Li <li...@apache.org>
Authored: Tue Jun 16 07:53:53 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 18 15:13:30 2015 +0800
----------------------------------------------------------------------
jdbc/pom.xml | 2 +-
pom.xml | 19 +++++++++----------
query/pom.xml | 6 +++---
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/650f81a3/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 7f707c7..485ed3d 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -22,7 +22,7 @@
<artifactId>kylin-jdbc</artifactId>
<packaging>jar</packaging>
<name>Kylin:JDBC</name>
- <description>Kylin JDBC Driver on optiq avatica</description>
+ <description>Kylin JDBC Driver on Calcite Avatica</description>
<parent>
<groupId>org.apache.kylin</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/650f81a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5748328..e49eb27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,9 +83,8 @@
<!-- REST Service -->
<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
- <!-- Optiq Version -->
- <optiq.version>0.9.2-incubating</optiq.version>
- <linq4j.version>0.4</linq4j.version>
+ <!-- Calcite Version -->
+ <calcite.version>1.0.0-incubating</calcite.version>
<!-- Metrics Codahale Version -->
<metrics.version>3.0.1</metrics.version>
@@ -102,7 +101,7 @@
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.language>java</sonar.language>
<sonar.jacoco.excludes>
- org/apache/kylin/**/tools/**:**/*CLI.java:net/hydromatic/optiq/**:org/eigenbase/sql2rel/**
+ org/apache/kylin/**/tools/**:**/*CLI.java
</sonar.jacoco.excludes>
</properties>
@@ -248,21 +247,21 @@
<version>${yarn.version}</version>
</dependency>
- <!-- optiq dependencies -->
+ <!-- Calcite dependencies -->
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
- <version>${optiq.version}</version>
+ <version>${calcite.version}</version>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-avatica</artifactId>
- <version>${optiq.version}</version>
+ <version>${calcite.version}</version>
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>linq4j</artifactId>
- <version>${linq4j.version}</version>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-linq4j</artifactId>
+ <version>${calcite.version}</version>
</dependency>
<!-- Other dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/650f81a3/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index 3881b4d..86fca54 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -23,7 +23,7 @@
<artifactId>kylin-query</artifactId>
<packaging>jar</packaging>
<name>Kylin:Query</name>
- <description>kylin query engine based on optiq</description>
+ <description>kylin query engine based on Calcite</description>
<parent>
<groupId>org.apache.kylin</groupId>
@@ -54,8 +54,8 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>linq4j</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-linq4j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>