lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject lucene-solr:jira/solr-8593: Cleanup Calcite versions
Date Mon, 02 May 2016 18:52:24 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/jira/solr-8593 1520ff381 -> 101945858


Cleanup Calcite versions


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/10194585
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/10194585
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/10194585

Branch: refs/heads/jira/solr-8593
Commit: 10194585877e4926f4da0abf4ea2ae818b8191b8
Parents: 1520ff3
Author: Kevin Risden <krisden@apache.org>
Authored: Mon May 2 13:52:18 2016 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Mon May 2 13:52:18 2016 -0500

----------------------------------------------------------------------
 lucene/ivy-versions.properties                               | 8 ++++++--
 solr/core/ivy.xml                                            | 6 +++---
 .../java/org/apache/solr/handler/sql/CalciteSolrDriver.java  | 3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10194585/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 000a8ab..1d403d7 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -20,8 +20,6 @@ com.codahale.metrics.version = 3.0.1
 /com.cybozu.labs/langdetect = 1.1-20120112
 /com.drewnoakes/metadata-extractor = 2.6.2
 
-/com.facebook.presto/presto-parser = 0.122
-
 com.fasterxml.jackson.core.version = 2.5.4
 /com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
 /com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
@@ -92,6 +90,12 @@ com.sun.jersey.version = 1.9
 
 /org.apache.ant/ant = 1.8.2
 /org.apache.avro/avro = 1.7.5
+
+org.apache.calcite.version = 1.6.0
+/org.apache.calcite/calcite-avatica = ${org.apache.calcite.version}
+/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
+/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
+
 /org.apache.commons/commons-compress = 1.8.1
 /org.apache.commons/commons-exec = 1.3
 /org.apache.commons/commons-math3 = 3.4.1

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10194585/solr/core/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 0813aaf..c87d6c9 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -133,9 +133,9 @@
     <dependency org="com.tdunning" name="t-digest" rev="${/com.tdunning/t-digest}" conf="compile->*"/>
 
     <!-- SQL Parser -->
-    <dependency org="org.apache.calcite" name="calcite-core" rev="1.7.0"/>
-    <dependency org="org.apache.calcite" name="calcite-linq4j" rev="1.7.0"/>
-    <dependency org="org.apache.calcite.avatica" name="avatica" rev="1.7.1"/>
+    <dependency org="org.apache.calcite" name="calcite-core" rev="${/org.apache.calcite/calcite-core}"/>
+    <dependency org="org.apache.calcite" name="calcite-linq4j" rev="${/org.apache.calcite/calcite-linq4j}"/>
+    <dependency org="org.apache.calcite" name="calcite-avatica" rev="${/org.apache.calcite/calcite-avatica}"/>
     <dependency org="net.hydromatic" name="eigenbase-properties" rev="1.1.5"/>
     <dependency org="org.codehaus.janino" name="janino" rev="2.7.6"/>
     <dependency org="org.codehaus.janino" name="commons-compiler" rev="2.7.6"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10194585/solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java b/solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java
index 917ac00..46cfee5 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java
@@ -21,6 +21,7 @@ import java.sql.SQLException;
 import java.util.Properties;
 
 import org.apache.calcite.jdbc.CalciteConnection;
+import org.apache.calcite.jdbc.Driver;
 import org.apache.calcite.schema.SchemaPlus;
 
 /**
@@ -28,7 +29,7 @@ import org.apache.calcite.schema.SchemaPlus;
  *
  * <p>It accepts connect strings that start with "jdbc:calcitesolr:".</p>
  */
-public class CalciteSolrDriver extends org.apache.calcite.jdbc.Driver {
+public class CalciteSolrDriver extends Driver {
   protected CalciteSolrDriver() {
     super();
   }


Mime
View raw message