You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/10/04 00:40:58 UTC
svn commit: r1393804 - in /lucene/dev/branches/lucene_solr_4_0: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/core/src/test/org/ap...
Author: hossman
Date: Wed Oct 3 22:40:55 2012
New Revision: 1393804
URL: http://svn.apache.org/viewvc?rev=1393804&view=rev
Log:
SOLR-3903: Fixed MissingFormatArgumentException in ConcurrentUpdateSolrServer (merge r1393794 from trunk)
Modified:
lucene/dev/branches/lucene_solr_4_0/ (props changed)
lucene/dev/branches/lucene_solr_4_0/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_0/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
lucene/dev/branches/lucene_solr_4_0/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt?rev=1393804&r1=1393803&r2=1393804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt Wed Oct 3 22:40:55 2012
@@ -351,6 +351,9 @@ Bug Fixes
* SOLR-3637: Commit Status at Core-Admin UI is always false (steffkes)
+* SOLR-3903: Fixed MissingFormatArgumentException in ConcurrentUpdateSolrServer
+ (hossman)
+
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1393804&r1=1393803&r2=1393804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Wed Oct 3 22:40:55 2012
@@ -156,9 +156,9 @@ public class ConcurrentUpdateSolrServer
if (params != null) {
String fmt = null;
if (params.getBool(UpdateParams.OPTIMIZE, false)) {
- fmt = "<optimize waitSearcher=\"%s\" waitFlush=\"%s\" />";
+ fmt = "<optimize waitSearcher=\"%s\" />";
} else if (params.getBool(UpdateParams.COMMIT, false)) {
- fmt = "<commit waitSearcher=\"%s\" waitFlush=\"%s\" />";
+ fmt = "<commit waitSearcher=\"%s\" />";
}
if (fmt != null) {
byte[] content = String.format(Locale.ROOT,
Modified: lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java?rev=1393804&r1=1393803&r2=1393804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java Wed Oct 3 22:40:55 2012
@@ -23,9 +23,17 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.request.RequestWriter;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.util.ExternalPaths;
-import org.junit.BeforeClass;
+import java.util.EnumSet;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.junit.BeforeClass;
+import org.junit.After;
/**
*
@@ -34,6 +42,9 @@ import org.junit.BeforeClass;
*/
@Slow
public class SolrExampleStreamingTest extends SolrExampleTests {
+
+ protected Throwable handledException = null;
+
@BeforeClass
public static void beforeTest() throws Exception {
createJetty(ExternalPaths.EXAMPLE_HOME, null, null);
@@ -50,7 +61,7 @@ public class SolrExampleStreamingTest ex
public Throwable lastError = null;
@Override
public void handleError(Throwable ex) {
- lastError = ex;
+ handledException = lastError = ex;
}
};
@@ -63,4 +74,39 @@ public class SolrExampleStreamingTest ex
throw new RuntimeException( ex );
}
}
+
+ public void testWaitOptions() throws Exception {
+ // SOLR-3903
+ final List<Throwable> failures = new ArrayList<Throwable>();
+ ConcurrentUpdateSolrServer s = new ConcurrentUpdateSolrServer
+ ("http://127.0.0.1:"+port+context, 2, 2) {
+ @Override
+ public void handleError(Throwable ex) {
+ failures.add(ex);
+ }
+ };
+
+ int docId = 42;
+ for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) {
+ for (boolean waitSearch : Arrays.asList(true, false)) {
+ for (boolean waitFlush : Arrays.asList(true, false)) {
+ UpdateRequest updateRequest = new UpdateRequest();
+ SolrInputDocument document = new SolrInputDocument();
+ document.addField("id", docId++ );
+ updateRequest.add(document);
+ updateRequest.setAction(action, waitSearch, waitFlush);
+ s.request(updateRequest);
+ }
+ }
+ }
+ s.commit();
+ s.blockUntilFinished();
+ s.shutdown();
+
+ if (0 != failures.size()) {
+ assertEquals(failures.size() + " Unexpected Exception, starting with...",
+ null, failures.get(0));
+ }
+ }
+
}