SOLR-1993: fix String cast assumption in JavaBinCodec

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1051611 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2010-12-21 18:59:57 +00:00
parent e18dcbf1b7
commit a3c39d6247
3 changed files with 66 additions and 12 deletions

View File

@ -572,6 +572,11 @@ Bug Fixes
* SOLR-2285: duplicate SolrEventListeners no longer created (hossman) * SOLR-2285: duplicate SolrEventListeners no longer created (hossman)
* SOLR-1993: fix String cast assumption in JavaBinCodec - specific
addresses "commitWithin" option on Update requests.
(noble, hossman, and Maxim Valyanskiy)
Other Changes Other Changes
---------------------- ----------------------

View File

@ -128,7 +128,7 @@ public class JavaBinUpdateRequestCodec {
private List readOuterMostDocIterator(FastInputStream fis) throws IOException { private List readOuterMostDocIterator(FastInputStream fis) throws IOException {
NamedList params = (NamedList) namedList[0].getVal(0); NamedList params = (NamedList) namedList[0].getVal(0);
updateRequest.setParams(namedListToSolrParams(params)); updateRequest.setParams(new ModifiableSolrParams(SolrParams.toSolrParams(params)));
if (handler == null) return super.readIterator(fis); if (handler == null) return super.readIterator(fis);
while (true) { while (true) {
Object o = readVal(fis); Object o = readVal(fis);
@ -207,17 +207,6 @@ public class JavaBinUpdateRequestCodec {
return nl; return nl;
} }
private ModifiableSolrParams namedListToSolrParams(NamedList nl) {
ModifiableSolrParams solrParams = new ModifiableSolrParams();
for (int i = 0; i < nl.size(); i++) {
List<String> l = (List) nl.getVal(i);
if (l != null)
solrParams.add(nl.getName(i),
l.toArray(new String[l.size()]));
}
return solrParams;
}
public static interface StreamingDocumentHandler { public static interface StreamingDocumentHandler {
public void document(SolrInputDocument document, UpdateRequest req); public void document(SolrInputDocument document, UpdateRequest req);
} }

View File

@ -0,0 +1,60 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.client.solrj;
import org.apache.solr.client.solrj.SolrExampleTests;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer;
import org.junit.BeforeClass;
/**
* A subclass of SolrExampleTests that explicitly uses the binary
* codec for communication.
*/
public class SolrExampleBinaryTest extends SolrExampleTests {
@BeforeClass
public static void beforeTest() throws Exception {
createJetty(EXAMPLE_HOME, null, null);
}
@Override
public SolrServer createNewSolrServer()
{
try {
// setup the server...
String url = "http://localhost:"+port+context;
CommonsHttpSolrServer s = new CommonsHttpSolrServer( url );
s.setConnectionTimeout(100); // 1/10th sec
s.setDefaultMaxConnectionsPerHost(100);
s.setMaxTotalConnections(100);
// where the magic happens
s.setParser(new BinaryResponseParser());
s.setRequestWriter(new BinaryRequestWriter());
return s;
}
catch( Exception ex ) {
throw new RuntimeException( ex );
}
}
}