You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/02/04 22:39:48 UTC
svn commit: r1657409 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Author: anshum
Date: Wed Feb 4 21:39:47 2015
New Revision: 1657409
URL: http://svn.apache.org/r1657409
Log:
SOLR-7049: LIST Collections API call should be processed directly by the CollectionsHandler instead of the OverseerCollectionProcessor.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1657409&r1=1657408&r2=1657409&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Feb 4 21:39:47 2015
@@ -103,6 +103,11 @@ Bug Fixes
* SOLR-7046: NullPointerException when group.function uses query() function.
(Jim Musil via Erick Erickson)
+Optimizations
+----------------------
+ * SOLR-7049: Move work done by the LIST Collections API call to the Collections
+ Handler (Varun Thacker via Anshum Gupta).
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1657409&r1=1657408&r2=1657409&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Wed Feb 4 21:39:47 2015
@@ -645,9 +645,6 @@ public class OverseerCollectionProcessor
case OVERSEERSTATUS:
getOverseerStatus(message, results);
break;
- case LIST:
- listCollections(zkStateReader.getClusterState(), results);
- break;
case CLUSTERSTATUS:
getClusterStatus(zkStateReader.getClusterState(), message, results);
break;
@@ -1010,16 +1007,6 @@ public class OverseerCollectionProcessor
}
@SuppressWarnings("unchecked")
- private void listCollections(ClusterState clusterState, NamedList results) {
- Set<String> collections = clusterState.getCollections();
- List<String> collectionList = new ArrayList<String>();
- for (String collection : collections) {
- collectionList.add(collection);
- }
- results.add("collections", collectionList);
- }
-
- @SuppressWarnings("unchecked")
private void processRoleCommand(ZkNodeProps message, String operation) throws KeeperException, InterruptedException {
SolrZkClient zkClient = zkStateReader.getZkClient();
Map roles = null;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1657409&r1=1657408&r2=1657409&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Wed Feb 4 21:39:47 2015
@@ -1051,9 +1051,16 @@ public class CollectionsHandler extends
* @throws InterruptedException connection interrupted
*/
private void handleListAction(SolrQueryRequest req, SolrQueryResponse rsp) throws KeeperException, InterruptedException {
- Map<String, Object> props = ZkNodeProps.makeMap(
- Overseer.QUEUE_OPERATION, CollectionAction.LIST.toString().toLowerCase(Locale.ROOT));
- handleResponse(CollectionAction.LIST.toString(), new ZkNodeProps(props), rsp);
+ NamedList<Object> results = new NamedList<>();
+ Set<String> collections = coreContainer.getZkController().getZkStateReader().getClusterState().getCollections();
+ List<String> collectionList = new ArrayList<>();
+ for (String collection : collections) {
+ collectionList.add(collection);
+ }
+ results.add("collections", collectionList);
+ SolrResponse response = new OverseerSolrResponse(results);
+
+ rsp.getValues().addAll(response.getResponse());
}