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

SOLR-3036: Ability to specify overwrite=false on the URL for XML updates. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1231514 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-01-14 15:21:42 +00:00
parent 5ca66287ea
commit 2504985445
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -427,6 +427,10 @@ New Features
* SOLR-2906: Added LFU cache options to Solr. (Shawn Heisey via Erick Erickson) * 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 Optimizations
---------------------- ----------------------
* SOLR-1931: Speedup for LukeRequestHandler and admin/schema browser. New parameter * 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 * 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) the client applications of SimplePostTool can set content type via method argument. (koji)
Bug Fixes Bug Fixes
---------------------- ----------------------
* SOLR-2912: Fixed File descriptor leak in ShowFileRequestHandler (Michael Ryan, shalin) * SOLR-2912: Fixed File descriptor leak in ShowFileRequestHandler (Michael Ryan, shalin)

1
solr/core/src/java/org/apache/solr/handler/XMLLoader.java
View File

@ -112,6 +112,7 @@ class XMLLoader extends ContentStreamLoader {
// First look for commitWithin parameter on the request, will be overwritten for individual <add>'s // First look for commitWithin parameter on the request, will be overwritten for individual <add>'s
addCmd.commitWithin = params.getInt(UpdateParams.COMMIT_WITHIN, -1); addCmd.commitWithin = params.getInt(UpdateParams.COMMIT_WITHIN, -1);
addCmd.overwrite = params.getBool(UpdateParams.OVERWRITE, true);
for (int i = 0; i < parser.getAttributeCount(); i++) { for (int i = 0; i < parser.getAttributeCount(); i++) {
String attrName = parser.getAttributeLocalName(i); String attrName = parser.getAttributeLocalName(i);

8
solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
View File

@ -80,7 +80,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
} }
@Test @Test
public void testCommitWithin() throws Exception public void testRequestParams() throws Exception
{ {
String xml = String xml =
"<add>" + "<add>" +
@ -90,7 +90,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
" </doc>" + " </doc>" +
"</add>"; "</add>";
SolrQueryRequest req = req("commitWithin","100"); SolrQueryRequest req = req("commitWithin","100","overwrite","false");
SolrQueryResponse rsp = new SolrQueryResponse(); SolrQueryResponse rsp = new SolrQueryResponse();
BufferingRequestProcessor p = new BufferingRequestProcessor(null); BufferingRequestProcessor p = new BufferingRequestProcessor(null);
@ -98,8 +98,8 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
loader.load(req, rsp, new ContentStreamBase.StringStream(xml)); loader.load(req, rsp, new ContentStreamBase.StringStream(xml));
AddUpdateCommand add = p.addCommands.get(0); AddUpdateCommand add = p.addCommands.get(0);
assertEquals(add.commitWithin, 100); assertEquals(100, add.commitWithin);
assertEquals(false, add.overwrite);
req.close(); req.close();
} }