You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/04/20 17:11:38 UTC
svn commit: r1095432 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/
contrib/uima/src/test/java/org/apache/solr/uima/processor/
contrib/uima/src/test/resources/solr-uima/conf/ example/solr/con...
Author: markrmiller
Date: Wed Apr 20 15:11:38 2011
New Revision: 1095432
URL: http://svn.apache.org/viewvc?rev=1095432&view=rev
Log:
SOLR-2105: Rename RequestHandler param 'update.processor' to 'update.chain'.
Added:
lucene/dev/trunk/solr/src/test/org/apache/solr/update/UpdateParamsTest.java (with props)
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/UpdateParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/trunk/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 20 15:11:38 2011
@@ -237,6 +237,10 @@ Carrot2 3.4.2
Upgrading from Solr 3.1
----------------------
+
+* The updateRequestProcessorChain for a RequestHandler is now defined
+ with update.chain rather than update.processor. The latter still works,
+ but has been deprecated.
Detailed Change List
----------------------
@@ -285,6 +289,9 @@ Bug Fixes
Other Changes
----------------------
+* SOLR-2105: Rename RequestHandler param 'update.processor' to 'update.chain'.
+ (Jan Høydahl via Mark Miller)
+
Build
----------------------
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java Wed Apr 20 15:11:38 2011
@@ -194,7 +194,7 @@ public class DataImportHandler extends R
IMPORT_CMD.equals(command)) {
UpdateRequestProcessorChain processorChain =
- req.getCore().getUpdateProcessingChain(params.get(UpdateParams.UPDATE_PROCESSOR));
+ req.getCore().getUpdateProcessingChain(params.get(UpdateParams.UPDATE_CHAIN));
UpdateRequestProcessor processor = processorChain.createProcessor(req, rsp);
SolrResourceLoader loader = req.getCore().getResourceLoader();
SolrWriter sw = getSolrWriter(processor, loader, requestParams, req);
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Wed Apr 20 15:11:38 2011
@@ -108,7 +108,7 @@ public class UIMAUpdateRequestProcessorT
private void addDoc(String doc) throws Exception {
Map<String, String[]> params = new HashMap<String, String[]>();
- params.put(UpdateParams.UPDATE_PROCESSOR, new String[] { "uima" });
+ params.put(UpdateParams.UPDATE_CHAIN, new String[] { "uima" });
MultiMapSolrParams mmparams = new MultiMapSolrParams(params);
SolrQueryRequestBase req = new SolrQueryRequestBase(h.getCore(), (SolrParams) mmparams) {
};
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml Wed Apr 20 15:11:38 2011
@@ -855,7 +855,7 @@
-->
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler">
<lst name="defaults">
- <str name="update.processor">uima</str>
+ <str name="update.chain">uima</str>
</lst>
</requestHandler>
@@ -997,7 +997,7 @@
anyway. You have to link the chain to an update handler above to use
it ie: <requestHandler name="/update
"class="solr.XmlUpdateRequestHandler"> <lst name="defaults"> <str
- name="update.processor">dedupe</str> </lst> </requestHandler>
+ name="update.chain">dedupe</str> </lst> </requestHandler>
-->
<updateRequestProcessorChain name="uima">
Modified: lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml Wed Apr 20 15:11:38 2011
@@ -841,7 +841,7 @@
-->
<!--
<lst name="defaults">
- <str name="update.processor">dedupe</str>
+ <str name="update.chain">dedupe</str>
</lst>
-->
</requestHandler>
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/UpdateParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/UpdateParams.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/UpdateParams.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/params/UpdateParams.java Wed Apr 20 15:11:38 2011
@@ -43,8 +43,11 @@ public interface UpdateParams
/** Rollback update commands */
public static String ROLLBACK = "rollback";
- /** Select the update processor to use. A RequestHandler may or may not respect this parameter */
- public static final String UPDATE_PROCESSOR = "update.processor";
+ /** Select the update processor chain to use. A RequestHandler may or may not respect this parameter */
+ public static final String UPDATE_CHAIN = "update.chain";
+ // TODO: Include the old deprecated param, for removal in Solr 4.0
+ public static final String UPDATE_CHAIN_DEPRECATED = "update.processor";
+
/**
* If optimizing, set the maximum number of segments left in the index after optimization. 1 is the default (and is equivalent to calling IndexWriter.optimize() in Lucene).
*/
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java Wed Apr 20 15:11:38 2011
@@ -24,6 +24,8 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -31,12 +33,22 @@ import org.apache.solr.update.processor.
*
**/
public abstract class ContentStreamHandlerBase extends RequestHandlerBase {
+ public static Logger log = LoggerFactory.getLogger(XmlUpdateRequestHandler.class);
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
SolrParams params = req.getParams();
+ String updateChainName = null;
+ if(params.get(UpdateParams.UPDATE_CHAIN_DEPRECATED) != null) {
+ log.warn("Use of deprecated update request parameter "+UpdateParams.UPDATE_CHAIN_DEPRECATED+
+ " detected. Please use the new parameter "+UpdateParams.UPDATE_CHAIN+" instead, as support"+
+ " for "+UpdateParams.UPDATE_CHAIN_DEPRECATED+" will be removed in a later version.");
+ updateChainName = params.get(UpdateParams.UPDATE_CHAIN_DEPRECATED);
+ } else {
+ updateChainName = params.get(UpdateParams.UPDATE_CHAIN);
+ }
UpdateRequestProcessorChain processorChain =
- req.getCore().getUpdateProcessingChain(params.get(UpdateParams.UPDATE_PROCESSOR));
+ req.getCore().getUpdateProcessingChain(updateChainName);
UpdateRequestProcessor processor = processorChain.createProcessor(req, rsp);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Wed Apr 20 15:11:38 2011
@@ -190,7 +190,7 @@ public class CoreAdminHandler extends Re
}
UpdateRequestProcessorChain processorChain =
- core.getUpdateProcessingChain(params.get(UpdateParams.UPDATE_PROCESSOR));
+ core.getUpdateProcessingChain(params.get(UpdateParams.UPDATE_CHAIN));
wrappedReq = new LocalSolrQueryRequest(core, req.getParams());
UpdateRequestProcessor processor =
processorChain.createProcessor(wrappedReq, rsp);
Added: lucene/dev/trunk/solr/src/test/org/apache/solr/update/UpdateParamsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/update/UpdateParamsTest.java?rev=1095432&view=auto
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/update/UpdateParamsTest.java (added)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/update/UpdateParamsTest.java Wed Apr 20 15:11:38 2011
@@ -0,0 +1 @@
+/**
* 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.update;
import java.util.HashMap;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.UpdateParams;
import org.apache.solr
.core.*;
import org.apache.solr.handler.XmlUpdateRequestHandler;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
public class UpdateParamsTest extends AbstractSolrTestCase {
@Override
public String getSchemaFile() { return "schema.xml"; }
@Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
/**
* Tests that both update.chain and update.processor works
* NOTE: This test will fail when support for update.processor is removed and should then be removed
*/
public void testUpdateProcessorParamDeprecation() throws Exception {
SolrCore core = h.getCore();
XmlUpdateRequestHandler handler = new XmlUpdateRequestHandler();
handler.init( null );
MapSolrParams params = new MapSolrParams( new HashMap<String, String>() );
params.getMap().put(UpdateParams.UPDATE_CHAIN_DEPRECATED, "nonexistant");
// Add a si
ngle document
SolrQueryResponse rsp = new SolrQueryResponse();
SolrQueryRequestBase req = new SolrQueryRequestBase( core, params ) {};
// First check that the old param behaves as it should
try {
handler.handleRequestBody(req, rsp);
assertFalse("Faulty update.processor parameter (deprecated but should work) not causing an error - i.e. it is not detected", true);
} catch (Exception e) {
assertEquals("Got wrong exception while testing update.chain", e.getMessage(), "unknown UpdateRequestProcessorChain: nonexistant");
}
// Then check that the new param behaves correctly
params.getMap().remove(UpdateParams.UPDATE_CHAIN_DEPRECATED);
params.getMap().put(UpdateParams.UPDATE_CHAIN, "nonexistant");
req.setParams(params);
try {
handler.handleRequestBody(req, rsp);
assertFalse("Faulty update.chain parameter not causing an error - i.e. it is not detected", true);
} catch (Exception e) {
assertEqu
als("Got wrong exception while testing update.chain", e.getMessage(), "unknown UpdateRequestProcessorChain: nonexistant");
}
}
}
\ No newline at end of file
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1095432&r1=1095431&r2=1095432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Wed Apr 20 15:11:38 2011
@@ -43,7 +43,7 @@ import org.junit.Test;
public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
/** modified by tests as needed */
- private String processor = "dedupe";
+ private String chain = "dedupe";
@BeforeClass
public static void beforeClass() throws Exception {
@@ -56,7 +56,7 @@ public class SignatureUpdateProcessorFac
super.setUp();
clearIndex();
assertU(commit());
- processor = "dedupe"; // set the default that most tests expect
+ chain = "dedupe"; // set the default that most tests expect
}
void checkNumDocs(int n) {
@@ -203,7 +203,7 @@ public class SignatureUpdateProcessorFac
checkNumDocs(0);
- processor = "stored_sig";
+ chain = "stored_sig";
addDoc(adoc("id", "2a", "v_t", "Hello Dude man!", "name", "ali babi'"));
addDoc(adoc("id", "2b", "v_t", "Hello Dude man!", "name", "ali babi'"));
addDoc(commit());
@@ -232,7 +232,7 @@ public class SignatureUpdateProcessorFac
private void addDoc(String doc) throws Exception {
Map<String, String[]> params = new HashMap<String, String[]>();
MultiMapSolrParams mmparams = new MultiMapSolrParams(params);
- params.put(UpdateParams.UPDATE_PROCESSOR, new String[] { processor });
+ params.put(UpdateParams.UPDATE_CHAIN, new String[] { chain });
SolrQueryRequestBase req = new SolrQueryRequestBase(h.getCore(),
(SolrParams) mmparams) {
};