Apache Solr open-source search software
SOLR-16845: BinaryResponseWriter should not attempt cast to Utf8CharSequence (#1728)
Alexc4fb1010285d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 45cec2b1cfd..3c3c1d1caa1 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -65,7 +65,8 @@ ImprovementsOptimizations----------------------(No changes)++* SOLR-16845: BinaryResponseWriter should not attempt cast to Utf8CharSequence (Alex Deparvu via Houston Putman)Bug Fixes---------------------diff --git a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.javaindex 7e248891009..7b72c7e78f6 100644--- a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java@@ -20,7 +20,6 @@ import static org.apache.solr.common.util.ByteArrayUtf8CharSequence.convertCharSimport java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;-import java.io.FileOutputStream;import java.io.IOException;import java.io.InputStream;import java.io.OutputStream;@@ -31,7 +30,6 @@ import java.util.Collection;import java.util.Iterator;import java.util.List;import java.util.function.Consumer;-import org.apache.lucene.document.StoredField;import org.apache.lucene.index.IndexableField;import org.apache.lucene.search.TotalHits;import org.apache.solr.client.solrj.impl.BinaryResponseParser;@@ -39,7 +37,6 @@ import org.apache.solr.common.SolrDocument;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.JavaBinCodec;import org.apache.solr.common.util.NamedList;-import org.apache.solr.common.util.Utf8CharSequence;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;@@ -62,15 +59,6 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {}}- private static void serialize(SolrQueryResponse response, Resolver resolver, String f)- throws IOException {- try (JavaBinCodec jbc = new JavaBinCodec(resolver);- FileOutputStream fos = new FileOutputStream(f)) {- jbc.setWritableDocFields(resolver).marshal(response.getValues(), fos);- fos.flush();- }- }-@Overridepublic void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response)throws IOException {@@ -95,13 +83,6 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {@Overridepublic Object resolve(Object o, JavaBinCodec codec) throws IOException {- if (o instanceof StoredField) {- CharSequence val = ((StoredField) o).getCharSequenceValue();- if (val instanceof Utf8CharSequence) {- codec.writeUTF8Str((Utf8CharSequence) val);- return null;- }- }if (o instanceof ResultContext) {ReturnFields orig = returnFields;ResultContext res = (ResultContext) o;diff --git a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.javaindex 2e0db1c763c..80dfe9db363 100644--- a/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestBinaryResponseWriter.java@@ -18,20 +18,14 @@ package org.apache.solr.response;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;-import java.io.IOException;-import java.nio.ByteBuffer;import java.util.Locale;import java.util.Map;import java.util.UUID;-import org.apache.lucene.document.StoredField;-import org.apache.lucene.document.TextField;import org.apache.lucene.util.BytesRef;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.cli.SimplePostTool;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.params.CommonParams;-import org.apache.solr.common.util.ByteArrayUtf8CharSequence;import org.apache.solr.common.util.ByteUtils;import org.apache.solr.common.util.JavaBinCodec;import org.apache.solr.common.util.NamedList;@@ -61,28 +55,6 @@ public class TestBinaryResponseWriter extends SolrTestCaseJ4 {"LIVE: सबरीमाला मंदिर के पास पहुंची दो महिलाएं, जमकर हो रहा विरोध-प्रदर्शन");}- public void testJavabinCodecWithCharSeq() throws IOException {- SolrDocument document = new SolrDocument();- document.put("id", "1");- String text = "नए लुक में धमाल मचाने आ रहे हैं MS Dhoni, कुछ यूं दिखाया हेलीकॉप्टर शॉट";- document.put(- "desc",- new StoredField("desc", new ByteArrayUtf8CharSequence(text) {}, TextField.TYPE_STORED));-- NamedList<Object> nl = new NamedList<>();- nl.add("doc1", document);- SimplePostTool.BAOS baos = new SimplePostTool.BAOS();- new JavaBinCodec(new BinaryResponseWriter.Resolver(null, null)).marshal(nl, baos);- ByteBuffer byteBuffer = baos.getByteBuffer();- NamedList<?> result =- (NamedList<?>)- new JavaBinCodec()- .unmarshal(- new ByteArrayInputStream(- byteBuffer.array(), byteBuffer.arrayOffset(), byteBuffer.limit()));- assertEquals(text, result._get("doc1/desc", null));- }-private void compareStringFormat(String input) {byte[] bytes1 = new byte[1024];int len1 = ByteUtils.UTF16toUTF8(input, 0, input.length(), bytes1, 0);