lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject svn commit: r1051616 - in /lucene/dev/branches/branch_3x/solr: ./ example/example-DIH/hsqldb/ src/solrj/org/apache/solr/client/solrj/request/ src/test/org/apache/solr/client/solrj/
Date Tue, 21 Dec 2010 19:09:07 GMT
Author: hossman
Date: Tue Dec 21 19:09:06 2010
New Revision: 1051616

URL: http://svn.apache.org/viewvc?rev=1051616&view=rev
Log:
SOLR-1993: merge r1051611 from trunk

Added:
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
      - copied unchanged from r1051611, lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
Modified:
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.log
    lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.properties
    lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1051616&r1=1051615&r2=1051616&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Dec 21 19:09:06 2010
@@ -480,6 +480,11 @@ Bug Fixes
 
 * 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
 ----------------------
 

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.log
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.log?rev=1051616&r1=1051615&r2=1051616&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.log (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.log Tue Dec 21 19:09:06
2010
@@ -1,2 +1,16 @@
-/*C1*/SET SCHEMA PUBLIC
+/*C2*/SET SCHEMA PUBLIC
 CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C3*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C4*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C5*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C3*/DISCONNECT
+/*C5*/DISCONNECT
+/*C4*/DISCONNECT
+/*C2*/DISCONNECT

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.properties?rev=1051616&r1=1051615&r2=1051616&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.properties (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/hsqldb/ex.properties Tue Dec 21
19:09:06 2010
@@ -1,5 +1,5 @@
-#HSQL Database Engine 1.8.0.5
-#Fri Aug 29 10:24:33 IST 2008
+#HSQL Database Engine 1.8.0.10
+#Mon Dec 13 17:24:59 PST 2010
 hsqldb.script_format=0
 runtime.gc_interval=0
 sql.enforce_strict_size=false

Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=1051616&r1=1051615&r2=1051616&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
(original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
Tue Dec 21 19:09:06 2010
@@ -128,7 +128,7 @@ public class JavaBinUpdateRequestCodec {
 
       private List readOuterMostDocIterator(FastInputStream fis) throws IOException {
         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);
         while (true) {
           Object o = readVal(fis);
@@ -207,17 +207,6 @@ public class JavaBinUpdateRequestCodec {
     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 void document(SolrInputDocument document, UpdateRequest req);
   }



Mime
View raw message