svn commit: r1231514 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/handler/XMLLoader.java core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java

[yo...@apache.org]

Author: yonik
Date: Sat Jan 14 15:21:42 2012
New Revision: 1231514

URL: http://svn.apache.org/viewvc?rev=1231514&view=rev
Log:
SOLR-3036: Ability to specify overwrite=false on the URL for XML updates.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/XMLLoader.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1231514&r1=1231513&r2=1231514&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jan 14 15:21:42 2012
@@ -427,6 +427,10 @@ New Features
   
 * SOLR-2906: Added LFU cache options to Solr. (Shawn Heisey via Erick Erickson)
 
+* SOLR-3036: Ability to specify overwrite=false on the URL for XML updates.
+  (Sami Siren via yonik)
+
+
 Optimizations
 ----------------------
 * SOLR-1931: Speedup for LukeRequestHandler and admin/schema browser. New parameter
@@ -436,6 +440,7 @@ Optimizations
 * SOLR-3012: Move System.getProperty("type") in postData() to main() and add type argument so that
   the client applications of SimplePostTool can set content type via method argument. (koji)
 
+
 Bug Fixes
 ----------------------
 * SOLR-2912: Fixed File descriptor leak in ShowFileRequestHandler (Michael Ryan, shalin)

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/XMLLoader.java?rev=1231514&r1=1231513&r2=1231514&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/XMLLoader.java Sat Jan 14 15:21:42 2012
@@ -112,6 +112,7 @@ class XMLLoader extends ContentStreamLoa
 
             // First look for commitWithin parameter on the request, will be overwritten for individual <add>'s
             addCmd.commitWithin = params.getInt(UpdateParams.COMMIT_WITHIN, -1);
+            addCmd.overwrite = params.getBool(UpdateParams.OVERWRITE, true);
             
             for (int i = 0; i < parser.getAttributeCount(); i++) {
               String attrName = parser.getAttributeLocalName(i);

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=1231514&r1=1231513&r2=1231514&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Sat Jan 14 15:21:42 2012
@@ -80,7 +80,7 @@ public class XmlUpdateRequestHandlerTest
   }
   
   @Test
-  public void testCommitWithin() throws Exception
+  public void testRequestParams() throws Exception
   {
     String xml = 
       "<add>" +
@@ -90,7 +90,7 @@ public class XmlUpdateRequestHandlerTest
       "  </doc>" +
       "</add>";
 
-    SolrQueryRequest req = req("commitWithin","100");
+    SolrQueryRequest req = req("commitWithin","100","overwrite","false");
     SolrQueryResponse rsp = new SolrQueryResponse();
     BufferingRequestProcessor p = new BufferingRequestProcessor(null);
 
@@ -98,8 +98,8 @@ public class XmlUpdateRequestHandlerTest
     loader.load(req, rsp, new ContentStreamBase.StringStream(xml));
 
     AddUpdateCommand add = p.addCommands.get(0);
-    assertEquals(add.commitWithin, 100);
-
+    assertEquals(100, add.commitWithin);
+    assertEquals(false, add.overwrite);
     req.close();
   }