svn commit: r900844 - in /lucene/solr/branches/cloud/src: java/org/apache/solr/cloud/ZkController.java java/org/apache/solr/handler/component/QueryComponent.java test/org/apache/solr/cloud/ZkControllerTest.java

[markrmiller]

Author: markrmiller
Date: Tue Jan 19 16:57:38 2010
New Revision: 900844

URL: http://svn.apache.org/viewvc?rev=900844&view=rev
Log:
CloudInfo should be CloudState

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
    
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
    
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java

Modified: 
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=900844&r1=900843&r2=900844&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java 
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java 
Tue Jan 19 16:57:38 2010
@@ -81,7 +81,7 @@
 
   private SolrZkClient zkClient;
 
-  private volatile CloudState cloudInfo;
+  private volatile CloudState cloudState;
 
   private String zkServerAddress;
 
@@ -213,8 +213,8 @@
   /**
    * @return information about the cluster from ZooKeeper
    */
-  public CloudState getCloudInfo() {
-    return cloudInfo;
+  public CloudState getCloudState() {
+    return cloudState;
   }
 
   public List<String> getCollectionNames() throws KeeperException,
@@ -407,7 +407,7 @@
     }
 
     // update volatile
-    this.cloudInfo = cloudInfo;
+    this.cloudState = cloudInfo;
   }
 
   /**

Modified: 
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=900844&r1=900843&r2=900844&view=diff
==============================================================================
--- 
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
 (original)
+++ 
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
 Tue Jan 19 16:57:38 2010
@@ -134,7 +134,7 @@
       } else {
         // we weren't provided with a list of slices to query, so find the 
list that will cover the complete index
 
-        cloudState =  
req.getCore().getCoreDescriptor().getCoreContainer().getZooKeeperController().getCloudInfo();
+        cloudState =  
req.getCore().getCoreDescriptor().getCoreContainer().getZooKeeperController().getCloudState();
 
         // TODO: EXAMPLE
         rb.slices = new String[]{"shard1","shard2"};
@@ -147,7 +147,7 @@
       for (int i=0; i<rb.shards.length; i++) {
         if (rb.shards[i] == null) {
           if (cloudState == null) {
-              cloudState =  
req.getCore().getCoreDescriptor().getCoreContainer().getZooKeeperController().getCloudInfo();
+              cloudState =  
req.getCore().getCoreDescriptor().getCoreContainer().getZooKeeperController().getCloudState();
           }
           String sliceStr = rb.slices[i];
           Slice slice = cloudState.getSlice(sliceStr);

Modified: 
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=900844&r1=900843&r2=900844&view=diff
==============================================================================
--- 
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java 
(original)
+++ 
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java 
Tue Jan 19 16:57:38 2010
@@ -75,7 +75,7 @@
       zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT,
           "localhost", "8983", "/solr");
       zkController.updateCloudState();
-      CloudState cloudInfo = zkController.getCloudInfo();
+      CloudState cloudInfo = zkController.getCloudState();
       Slice slice = cloudInfo.getSlice("collection1");
       assertNotNull(slice);