Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12983: tests don't need to use the optimization

This commit is contained in:
Noble Paul 2019-01-08 17:25:26 +11:00
parent 3932a4cc6c
commit 825e63c00b
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
View File

@ -118,7 +118,9 @@ public class JavabinLoader extends ContentStreamLoader {
for (; ; ) {
if (in.peek() == -1) return;
try {
update = new JavaBinUpdateRequestCodec().unmarshal(in, handler);
update = new JavaBinUpdateRequestCodec()
.setReadStringAsCharSeq(true)
.unmarshal(in, handler);
} catch (EOFException e) {
break; // this is expected
}

19
solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
View File

@ -51,6 +51,13 @@ import static org.apache.solr.common.util.ByteArrayUtf8CharSequence.convertCharS
* @since solr 1.4
*/
public class JavaBinUpdateRequestCodec {
private boolean readStringAsCharSeq = false;
public JavaBinUpdateRequestCodec setReadStringAsCharSeq(boolean flag) {
this.readStringAsCharSeq = flag;
return this;
}
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final AtomicBoolean WARNED_ABOUT_INDEX_TIME_BOOSTS = new AtomicBoolean();
@ -274,16 +281,6 @@ public class JavaBinUpdateRequestCodec {
}
/* @Override
protected Object readDocumentFieldVal(String fieldName, DataInputInputStream dis) throws IOException {
super.readStringAsCharSeq = utf8FieldPredicate != null && utf8FieldPredicate.test(fieldName);
try {
return super.readDocumentFieldVal(fieldName, dis);
} finally {
super.readStringAsCharSeq = false;
}
}*/
private List readOuterMostDocIterator(DataInputInputStream fis) throws IOException {
NamedList params = (NamedList) namedList[0].get("params");
updateRequest.setParams(new ModifiableSolrParams(params.toSolrParams()));
@ -291,7 +288,7 @@ public class JavaBinUpdateRequestCodec {
Integer commitWithin = null;
Boolean overwrite = null;
Object o = null;
super.readStringAsCharSeq = true;
super.readStringAsCharSeq = JavaBinUpdateRequestCodec.this.readStringAsCharSeq;
try {
while (true) {
if (o == null) {