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/10/11 20:28:19 UTC
lucene-solr:branch_6x: SOLR-8969: Fix static cloud check
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 2e03aa97b -> 98827c5ca
SOLR-8969: Fix static cloud check
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/98827c5c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/98827c5c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/98827c5c
Branch: refs/heads/branch_6x
Commit: 98827c5cad9fd8d0c26f34274509f55d9f6014d0
Parents: 2e03aa9
Author: Kevin Risden <kr...@apache.org>
Authored: Tue Oct 11 14:48:25 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Tue Oct 11 15:28:00 2016 -0500
----------------------------------------------------------------------
.../src/java/org/apache/solr/handler/SQLHandler.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98827c5c/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 5fcf938..3074d9b 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -78,25 +78,22 @@ import com.facebook.presto.sql.parser.SqlParser;
public class SQLHandler extends RequestHandlerBase implements SolrCoreAware , PermissionNameProvider {
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private static String defaultZkhost = null;
private static String defaultWorkerCollection = null;
- private static List<String> remove;
-
- static {
- remove = new ArrayList();
- remove.add("count(*)");
- }
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final String sqlNonCloudErrorMsg = "/sql handler only works in Solr Cloud mode";
- public void inform(SolrCore core) {
+ private boolean isCloud = false;
+ public void inform(SolrCore core) {
CoreContainer coreContainer = core.getCoreDescriptor().getCoreContainer();
if(coreContainer.isZooKeeperAware()) {
defaultZkhost = core.getCoreDescriptor().getCoreContainer().getZkController().getZkServerAddress();
defaultWorkerCollection = core.getCoreDescriptor().getCollectionName();
+ isCloud = true;
}
}
@@ -121,7 +118,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware , Pe
try {
- if(workerZkhost == null) {
+ if(!isCloud) {
throw new IllegalStateException(sqlNonCloudErrorMsg);
}