KYLIN-2394 Upgrade Calcite to 1.11 and Avatica 1.9
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4b413a29 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4b413a29 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4b413a29 Branch: refs/heads/yang22-cdh5.7 Commit: 4b413a29ef3d5373485426d3ea2e00ee5e38b97c Parents: 5ef2480 Author: Billy Liu <billy...@apache.org> Authored: Wed Feb 15 22:45:04 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Wed Feb 15 22:45:04 2017 +0800 ---------------------------------------------------------------------- atopcalcite/pom.xml | 11 +- .../calcite/sql2rel/SqlToRelConverter.java | 3212 ++++++++++++------ jdbc/pom.xml | 10 +- .../java/org/apache/kylin/jdbc/KylinMeta.java | 2 +- kylin-it/pom.xml | 22 +- .../org/apache/kylin/jdbc/ITJDBCDriverTest.java | 1 + pom.xml | 6 +- query/pom.xml | 10 +- 8 files changed, 2127 insertions(+), 1147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/4b413a29/atopcalcite/pom.xml ---------------------------------------------------------------------- diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index c1dba66..3ad6705 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -38,7 +38,16 @@ <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> </dependency> </dependencies> - </project>