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

Fix missing dependency and minor changes

This commit is contained in:
Kevin Risden 2016-04-28 11:07:46 -05:00
parent b08a463639
commit c074b29059
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/core/ivy.xml
View File

@ -135,6 +135,7 @@
<!-- SQL Parser --> <!-- SQL Parser -->
<dependency org="org.apache.calcite" name="calcite-core" rev="1.6.0"/> <dependency org="org.apache.calcite" name="calcite-core" rev="1.6.0"/>
<dependency org="org.apache.calcite" name="calcite-linq4j" rev="1.6.0"/> <dependency org="org.apache.calcite" name="calcite-linq4j" rev="1.6.0"/>
<dependency org="org.apache.calcite" name="calcite-avatica" rev="1.6.0"/>
<dependency org="net.hydromatic" name="eigenbase-properties" rev="1.1.5"/> <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="janino" rev="2.7.6"/>
<dependency org="org.codehaus.janino" name="commons-compiler" rev="2.7.6"/> <dependency org="org.codehaus.janino" name="commons-compiler" rev="2.7.6"/>

2
solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java
View File

@ -47,7 +47,7 @@ public interface SolrRel extends RelNode {
/** Adds newly projected fields and restricted filterQueries. /** Adds newly projected fields and restricted filterQueries.
* *
* @param fields New fields to be projected from a query * @param fieldMappings New fields to be projected from a query
* @param filterQueries New filterQueries to be applied to the query * @param filterQueries New filterQueries to be applied to the query
*/ */
public void add(Map<String, String> fieldMappings, List<String> filterQueries) { public void add(Map<String, String> fieldMappings, List<String> filterQueries) {

4
solr/core/src/java/org/apache/solr/handler/sql/package-info.java Normal file
View File

@ -0,0 +1,4 @@
/**
* Classes related to Apache Calcite implementation in {@link org.apache.solr.handler.SQLHandler}
*/
package org.apache.solr.handler.sql;

4
solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
View File

@ -519,7 +519,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
commit(); commit();
Map params = new HashMap(); Map params = new HashMap();
params.put(CommonParams.QT, "/sql"); params.put(CommonParams.QT, "/sql");
params.put("stmt", "select str_s, 'count(*)', sum('field_i'), min(field_i), max(field_i), avg(field_i) from collection1 where text='XXXX' group by 'str_s' order by 'sum(field_i)' asc limit 2"); params.put("stmt", "select str_s, count(*), sum(field_i), min(field_i), max(field_i), avg(field_i) from collection1 where text='XXXX' group by str_s order by sum(field_i) asc limit 2");
SolrStream solrStream = new SolrStream(jetty.url, params); SolrStream solrStream = new SolrStream(jetty.url, params);
List<Tuple> tuples = getTuples(solrStream); List<Tuple> tuples = getTuples(solrStream);
@ -547,7 +547,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
params.put(CommonParams.QT, "/sql"); params.put(CommonParams.QT, "/sql");
params.put("stmt", "select str_s as myString, 'count(*)', sum('field_i') as sum, min(field_i), max(field_i), avg(field_i) from collection1 where text='XXXX' group by 'str_s' order by sum asc limit 2"); params.put("stmt", "select str_s as myString, count(*), sum(field_i) as sum, min(field_i), max(field_i), avg(field_i) from collection1 where text='XXXX' group by str_s order by sum asc limit 2");
solrStream = new SolrStream(jetty.url, params); solrStream = new SolrStream(jetty.url, params);
tuples = getTuples(solrStream); tuples = getTuples(solrStream);