From c074b290591e0830e0f3da688c1133cb1a76afb3 Mon Sep 17 00:00:00 2001
From: Kevin Risden <krisden@apache.org>
Date: Thu, 28 Apr 2016 11:07:46 -0500
Subject: [PATCH] Fix missing dependency and minor changes

---
 solr/core/ivy.xml                                             | 1 +
 solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java   | 2 +-
 .../src/java/org/apache/solr/handler/sql/package-info.java    | 4 ++++
 .../core/src/test/org/apache/solr/handler/TestSQLHandler.java | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/handler/sql/package-info.java

diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index a885b750dea..6ee534172a1 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -135,6 +135,7 @@
     <!-- SQL Parser -->
     <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-avatica" rev="1.6.0"/>
     <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"/>
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java b/solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java
index 70dd8cc39d5..44afee3869b 100644
--- a/solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java
+++ b/solr/core/src/java/org/apache/solr/handler/sql/SolrRel.java
@@ -47,7 +47,7 @@ public interface SolrRel extends RelNode {
 
     /** 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
      */
     public void add(Map<String, String> fieldMappings, List<String> filterQueries) {
diff --git a/solr/core/src/java/org/apache/solr/handler/sql/package-info.java b/solr/core/src/java/org/apache/solr/handler/sql/package-info.java
new file mode 100644
index 00000000000..7346ec54050
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/handler/sql/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Classes related to Apache Calcite implementation in {@link org.apache.solr.handler.SQLHandler}
+ */
+package org.apache.solr.handler.sql;
\ No newline at end of file
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 26975cda872..f96bdbaf9c7 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -519,7 +519,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
       commit();
       Map params = new HashMap();
       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);
       List<Tuple> tuples = getTuples(solrStream);
@@ -547,7 +547,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
 
 
       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);
       tuples = getTuples(solrStream);