Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup Calcite versions

This commit is contained in:
Kevin Risden 2016-05-02 13:52:18 -05:00
parent 1520ff3810
commit 1019458587
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lucene/ivy-versions.properties
View File

@ -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

6
solr/core/ivy.xml
View File

@ -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"/>

3
solr/core/src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java
View File

@ -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();
}