You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2023/04/21 20:39:14 UTC
[solr] branch branch_9x updated: Revert "Avoid unnecessary map creation while serializing DocCollection"
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 0e65f091036 Revert "Avoid unnecessary map creation while serializing DocCollection"
0e65f091036 is described below
commit 0e65f091036531893385cf16e3f236555dc7bfd3
Author: Noble Paul <no...@gmail.com>
AuthorDate: Sat Apr 22 06:37:19 2023 +1000
Revert "Avoid unnecessary map creation while serializing DocCollection"
This reverts commit 2ac7ed29563a33d9f9a31737996a1d4cfb0fca0d.
SOLR-16753: SplitShardWithNodeRoleTest.testSolrClusterWithNodeRoleWithPull failures
---
.../java/org/apache/solr/common/cloud/DocCollection.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
index 3806a1a008b..55068c70aac 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -31,8 +32,8 @@ import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import java.util.function.Supplier;
-import org.apache.solr.common.MapWriter;
import org.apache.solr.common.cloud.Replica.ReplicaStateProps;
+import org.apache.solr.common.util.CollectionUtil;
import org.noggit.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -327,12 +328,10 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
@Override
public void write(JSONWriter jsonWriter) {
- jsonWriter.write(
- (MapWriter)
- ew -> {
- propMap.forEach(ew.getBiConsumer());
- ew.put(CollectionStateProps.SHARDS, slices);
- });
+ LinkedHashMap<String, Object> all = CollectionUtil.newLinkedHashMap(slices.size() + 1);
+ all.putAll(propMap);
+ all.put(CollectionStateProps.SHARDS, slices);
+ jsonWriter.write(all);
}
public Replica getReplica(String coreNodeName) {