You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/04/29 15:14:05 UTC

lucene-solr:jira/solr-8593: Minor fixes for CalciteSolrDriver and SQLHandler

Repository: lucene-solr
Updated Branches:
  refs/heads/jira/solr-8593 52cc4d16b -> e9ff7264e


Minor fixes for CalciteSolrDriver and SQLHandler


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

Branch: refs/heads/jira/solr-8593
Commit: e9ff7264ed8c135bf121c622a323d007c0205547
Parents: 52cc4d1
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Apr 29 08:12:26 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Apr 29 08:12:26 2016 -0500

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/handler/SQLHandler.java        | 3 ++-
 .../src/java/org/apache/solr/handler/sql/CalciteSolrDriver.java   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9ff7264/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
index 3f38eab..7cc347a 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.calcite.config.Lex;
 import org.apache.solr.client.solrj.io.Tuple;
 import org.apache.solr.client.solrj.io.comp.StreamComparator;
 import org.apache.solr.client.solrj.io.stream.ExceptionStream;
@@ -147,7 +148,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware , Pe
       }
 
       // Set these last to ensure that they are set properly
-      properties.setProperty("lex", "MYSQL");
+      properties.setProperty("lex", Lex.MYSQL.toString());
       properties.setProperty("zk", defaultZkhost);
 
       try {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9ff7264/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 0f4c5f8..917ac00 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
@@ -49,6 +49,9 @@ public class CalciteSolrDriver extends org.apache.calcite.jdbc.Driver {
     final SchemaPlus rootSchema = calciteConnection.getRootSchema();
 
     String schemaName = info.getProperty("zk");
+    if(schemaName == null) {
+      throw new SQLException("zk must be set");
+    }
     rootSchema.add(schemaName, new SolrSchema(info));
 
     // Set the default schema