Apache Solr open-source search software
SOLR-16530 : Performance degradation in NoggitJSONWriter (#1169)
Noble Paul640221a6ada3
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NoggitJSONWriter.java b/solr/solrj/src/java/org/apache/solr/common/util/NoggitJSONWriter.javaindex 7dc474faa6b..139c3c32c60 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/NoggitJSONWriter.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/NoggitJSONWriter.java@@ -18,6 +18,7 @@package org.apache.solr.common.util;import java.io.IOException;+import java.util.function.BiConsumer;import org.apache.solr.common.IteratorWriter;import org.apache.solr.common.MapWriter;import org.noggit.CharArr;@@ -31,67 +32,58 @@ public class NoggitJSONWriter extends JSONWriter {}@Override- public void write(Object o) {+ @SuppressWarnings("rawtypes")+ public void handleUnknownClass(Object o) {+ // avoid materializing MapWriter / IteratorWriter to Map / List+ // instead serialize them directlyif (o instanceof MapWriter) {MapWriter mapWriter = (MapWriter) o;startObject();- try {- mapWriter.writeMap(entryWriter());- } catch (IOException e) {- throw new RuntimeException(e);- }++ mapWriter._forEachEntry(+ new BiConsumer() {+ boolean first = true;++ @Override+ public void accept(Object k, Object v) {+ if (first) {+ first = false;+ } else {+ writeValueSeparator();+ }+ indent();+ writeString(k.toString());+ writeNameSeparator();+ write(v);+ }+ });endObject();} else if (o instanceof IteratorWriter) {IteratorWriter iteratorWriter = (IteratorWriter) o;startArray();try {- iteratorWriter.writeIter(itemWriter());+ iteratorWriter.writeIter(+ new IteratorWriter.ItemWriter() {+ boolean first = true;++ @Override+ public IteratorWriter.ItemWriter add(Object o) {+ if (first) {+ first = false;+ } else {+ writeValueSeparator();+ }+ indent();+ write(o);+ return this;+ }+ });} catch (IOException e) {throw new RuntimeException("this should never happen", e);}endArray();- } else if (o instanceof MapWriter.StringValue) {- super.write(o.toString());} else {- super.write(o);+ super.handleUnknownClass(o);}}-- private IteratorWriter.ItemWriter itemWriter() {- return new IteratorWriter.ItemWriter() {- private boolean first = true;-- @Override- public IteratorWriter.ItemWriter add(Object o) {- if (first) {- first = false;- } else {- writeValueSeparator();- }- indent();- write(o);- return this;- }- };- }-- private MapWriter.EntryWriter entryWriter() {- return new MapWriter.EntryWriter() {- private boolean first = true;-- @Override- public MapWriter.EntryWriter put(CharSequence k, Object v) {- if (first) {- first = false;- } else {- writeValueSeparator();- }- indent();- writeString(k.toString());- writeNameSeparator();- write(v);- return this;- }- };- }}