Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Avoid unnecessary map creation while serializing DocCollection

Noble Paul2ac7ed29563a
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 55068c70aac..3806a1a008b 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,7 +24,6 @@ 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;
@@ -32,8 +31,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;
@@ -328,10 +327,12 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
@Override
public void write(JSONWriter jsonWriter) {
- LinkedHashMap<String, Object> all = CollectionUtil.newLinkedHashMap(slices.size() + 1);
- all.putAll(propMap);
- all.put(CollectionStateProps.SHARDS, slices);
- jsonWriter.write(all);
+ jsonWriter.write(
+ (MapWriter)
+ ew -> {
+ propMap.forEach(ew.getBiConsumer());
+ ew.put(CollectionStateProps.SHARDS, slices);
+ });
}
public Replica getReplica(String coreNodeName) {