You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/03/13 15:00:32 UTC
svn commit: r1455943 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
Author: markrmiller
Date: Wed Mar 13 14:00:32 2013
New Revision: 1455943
URL: http://svn.apache.org/r1455943
Log:
SOLR-4566: revert
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1455943&r1=1455942&r2=1455943&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 13 14:00:32 2013
@@ -81,8 +81,6 @@ Bug Fixes
* SOLR-4567: copyField source glob matching explicit field(s) stopped working
in Solr 4.2. (Alexandre Rafalovitch, Steve Rowe)
-* SOLR-4566: Fix DocCollection to return all shards not just active shards.
- (Mark Miller)
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java?rev=1455943&r1=1455942&r2=1455943&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java Wed Mar 13 14:00:32 2013
@@ -171,7 +171,7 @@ public class SliceStateUpdateTest extend
Map<String, Slice> slices = null;
for (int i = 75; i > 0; i--) {
clusterState2 = zkController2.getClusterState();
- slices = clusterState2.getSlicesMap("collection1");
+ slices = clusterState2.getAllSlicesMap("collection1");
if (slices != null && slices.containsKey("shard1")
&& slices.get("shard1").getState().equals("inactive")) {
break;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1455943&r1=1455942&r2=1455943&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Wed Mar 13 14:00:32 2013
@@ -114,11 +114,17 @@ public class ClusterState implements JSO
if (coll == null) return null;
return coll.getSlicesMap();
}
+
+ public Map<String, Slice> getAllSlicesMap(String collection) {
+ DocCollection coll = collectionStates.get(collection);
+ if (coll == null) return null;
+ return coll.getAllSlicesMap();
+ }
public Collection<Slice> getSlices(String collection) {
DocCollection coll = collectionStates.get(collection);
if (coll == null) return null;
- return coll.getSlicesMap().values();
+ return coll.getSlices();
}
/**
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java?rev=1455943&r1=1455942&r2=1455943&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java Wed Mar 13 14:00:32 2013
@@ -17,14 +17,16 @@ package org.apache.solr.common.cloud;
* limitations under the License.
*/
+import org.apache.noggit.JSONUtil;
+import org.apache.noggit.JSONWriter;
+
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.noggit.JSONUtil;
-import org.apache.noggit.JSONWriter;
-
/**
* Models a Collection in zookeeper (but that Java name is obviously taken, hence "DocCollection")
*/
@@ -34,6 +36,7 @@ public class DocCollection extends ZkNod
private final String name;
private final Map<String, Slice> slices;
+ private final Map<String, Slice> allSlices;
private final DocRouter router;
/**
@@ -45,7 +48,16 @@ public class DocCollection extends ZkNod
super( props==null ? Collections.<String,Object>emptyMap() : props);
this.name = name;
- this.slices = slices;
+ this.allSlices = slices;
+ this.slices = new HashMap<String, Slice>();
+
+ Iterator<Map.Entry<String, Slice>> iter = slices.entrySet().iterator();
+
+ while (iter.hasNext()) {
+ Map.Entry<String, Slice> slice = iter.next();
+ if (slice.getValue().getState().equals(Slice.ACTIVE))
+ this.slices.put(slice.getKey(), slice.getValue());
+ }
this.router = router;
assert name != null && slices != null;
@@ -60,16 +72,24 @@ public class DocCollection extends ZkNod
}
public Slice getSlice(String sliceName) {
- return slices.get(sliceName);
+ return allSlices.get(sliceName);
}
/**
- * Return the list of all slices for this collection.
+ * Gets the list of active slices for this collection.
*/
public Collection<Slice> getSlices() {
return slices.values();
}
+
+ /**
+ * Return the list of all slices for this collection.
+ */
+ public Collection<Slice> getAllSlices() {
+ return allSlices.values();
+ }
+
/**
* Get the map of active slices (sliceName->Slice) for this collection.
*/
@@ -77,6 +97,13 @@ public class DocCollection extends ZkNod
return slices;
}
+ /**
+ * Get the map of all slices (sliceName->Slice) for this collection.
+ */
+ public Map<String, Slice> getAllSlicesMap() {
+ return allSlices;
+ }
+
public DocRouter getRouter() {
return router;
}
@@ -88,9 +115,9 @@ public class DocCollection extends ZkNod
@Override
public void write(JSONWriter jsonWriter) {
- LinkedHashMap<String, Object> all = new LinkedHashMap<String, Object>(slices.size() + 1);
+ LinkedHashMap<String, Object> all = new LinkedHashMap<String, Object>(allSlices.size() + 1);
all.putAll(propMap);
- all.put(SHARDS, slices);
+ all.put(SHARDS, allSlices);
jsonWriter.write(all);
}
}