mirror of https://github.com/apache/lucene.git
SOLR-133: Adding StaxUpdateRequestHandler.java and mapping it to:
http://localhost:8983/solr/admin/update/stax in the example solrconfig.xml We should test and evaluate this in comparison to the XmlUpdateRequestHandler before replacing it. git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@547495 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley
parent
04e7c94b99
commit
0973e23e52
|
|
@ -400,7 +400,15 @@
|
|||
The response format differs from solr1.1 formatting and returns a standard error code.
|
||||
|
||||
To enable solr1.1 behavior, remove the /update handler or change its path
|
||||
|
||||
"update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
|
||||
only once. This can not be changed for each request.
|
||||
-->
|
||||
<requestHandler name="/update/stax" class="solr.StaxUpdateRequestHandler" >
|
||||
<!--
|
||||
<str name="update.processor.class">org.apache.solr.handler.UpdateRequestProcessor</str>
|
||||
-->
|
||||
</requestHandler>
|
||||
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
|
||||
|
||||
<!-- CSV update handler, loaded on demand -->
|
||||
|
|
|
|||
|
|
@ -0,0 +1,447 @@
|
|||
/**
|
||||
* 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.handler;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.Writer;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.HashMap;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javanet.staxutils.BaseXMLInputFactory;
|
||||
|
||||
import javax.xml.stream.FactoryConfigurationError;
|
||||
import javax.xml.stream.XMLInputFactory;
|
||||
import javax.xml.stream.XMLStreamConstants;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
import javax.xml.transform.TransformerConfigurationException;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.solr.common.SolrException;
|
||||
import org.apache.solr.common.SolrInputDocument;
|
||||
import org.apache.solr.common.params.MapSolrParams;
|
||||
import org.apache.solr.common.params.SolrParams;
|
||||
import org.apache.solr.common.util.ContentStream;
|
||||
import org.apache.solr.common.util.NamedList;
|
||||
import org.apache.solr.common.util.StrUtils;
|
||||
import org.apache.solr.common.util.XML;
|
||||
import org.apache.solr.core.Config;
|
||||
import org.apache.solr.core.SolrCore;
|
||||
import org.apache.solr.request.SolrQueryRequest;
|
||||
import org.apache.solr.request.SolrQueryRequestBase;
|
||||
import org.apache.solr.request.SolrQueryResponse;
|
||||
import org.apache.solr.update.AddUpdateCommand;
|
||||
import org.apache.solr.update.CommitUpdateCommand;
|
||||
import org.apache.solr.update.DeleteUpdateCommand;
|
||||
|
||||
/**
|
||||
* Add documents to solr using the STAX XML parser.
|
||||
*
|
||||
* To change the UpdateRequestProcessor implementation, add the configuration parameter:
|
||||
*
|
||||
* <requestHandler name="/update" class="solr.StaxUpdateRequestHandler" >
|
||||
* <str name="update.processor.class">org.apache.solr.handler.UpdateRequestProcessor</str>
|
||||
* </requestHandler>
|
||||
*
|
||||
*/
|
||||
public class StaxUpdateRequestHandler extends RequestHandlerBase
|
||||
{
|
||||
public static Logger log = Logger.getLogger(StaxUpdateRequestHandler.class.getName());
|
||||
|
||||
public static final String UPDATE_PROCESSOR_CLASS = "update.processor.class";
|
||||
|
||||
// XML Constants
|
||||
public static final String ADD = "add";
|
||||
public static final String DELETE = "delete";
|
||||
public static final String OPTIMIZE = "optimize";
|
||||
public static final String COMMIT = "commit";
|
||||
public static final String WAIT_SEARCHER = "waitSearcher";
|
||||
public static final String WAIT_FLUSH = "waitFlush";
|
||||
public static final String MODE = "mode";
|
||||
|
||||
public static final String OVERWRITE = "overwrite";
|
||||
public static final String OVERWRITE_COMMITTED = "overwriteCommitted"; // @Deprecated
|
||||
public static final String OVERWRITE_PENDING = "overwritePending"; // @Deprecated
|
||||
public static final String ALLOW_DUPS = "allowDups";
|
||||
|
||||
private XMLInputFactory inputFactory;
|
||||
private Constructor<? extends UpdateRequestProcessor> processorConstructor;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void init(NamedList args)
|
||||
{
|
||||
super.init(args);
|
||||
inputFactory = BaseXMLInputFactory.newInstance();
|
||||
|
||||
Class<? extends UpdateRequestProcessor> clazz = null;
|
||||
String className = null;
|
||||
try {
|
||||
if( args != null ) {
|
||||
className = (String)args.get( UPDATE_PROCESSOR_CLASS );
|
||||
if( className != null ) {
|
||||
clazz = Config.findClass( className, new String[]{} );
|
||||
}
|
||||
}
|
||||
if( clazz == null ) {
|
||||
clazz = UpdateRequestProcessor.class;
|
||||
}
|
||||
processorConstructor = clazz.getConstructor( SolrQueryRequest.class );
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
|
||||
"error initializing processor class: "+className, e );
|
||||
}
|
||||
if( processorConstructor == null ) {
|
||||
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
|
||||
"invalid processor: " + clazz );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Let subclasses override what processor is used. The default behavior is
|
||||
* to use one configured through the init parameter "processor"
|
||||
*/
|
||||
protected UpdateRequestProcessor getUpdateRequestProcessor( SolrQueryRequest req )
|
||||
{
|
||||
try {
|
||||
return processorConstructor.newInstance( new Object[] {req} );
|
||||
}
|
||||
catch( Exception ex ) {
|
||||
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
|
||||
"error making UpdateRequestProcessor", ex );
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception
|
||||
{
|
||||
Iterable<ContentStream> streams = req.getContentStreams();
|
||||
if( streams == null ) {
|
||||
if( !RequestHandlerUtils.handleCommit(req, rsp, false) ) {
|
||||
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST, "missing content stream" );
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
RequestHandlerUtils.addExperimentalFormatWarning( rsp );
|
||||
|
||||
// Cycle through each stream
|
||||
for( ContentStream stream : req.getContentStreams() ) {
|
||||
Reader reader = stream.getReader();
|
||||
try {
|
||||
NamedList out = this.update( req, req.getCore(), reader );
|
||||
rsp.add( "update", out );
|
||||
}
|
||||
finally {
|
||||
IOUtils.closeQuietly(reader);
|
||||
}
|
||||
}
|
||||
|
||||
// perhaps commit when we are done
|
||||
RequestHandlerUtils.handleCommit(req, rsp, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @since solr 1.2
|
||||
*/
|
||||
NamedList<Object> processUpdate( SolrQueryRequest req, SolrCore core, XMLStreamReader parser)
|
||||
throws XMLStreamException, IOException, FactoryConfigurationError,
|
||||
InstantiationException, IllegalAccessException,
|
||||
TransformerConfigurationException
|
||||
{
|
||||
UpdateRequestProcessor processor = getUpdateRequestProcessor( req );
|
||||
|
||||
AddUpdateCommand addCmd = null;
|
||||
while (true) {
|
||||
int event = parser.next();
|
||||
switch (event) {
|
||||
case XMLStreamConstants.END_DOCUMENT:
|
||||
parser.close();
|
||||
return processor.getResponse();
|
||||
|
||||
case XMLStreamConstants.START_ELEMENT:
|
||||
String currTag = parser.getLocalName();
|
||||
if (currTag.equals(ADD)) {
|
||||
log.finest("SolrCore.update(add)");
|
||||
|
||||
addCmd = new AddUpdateCommand();
|
||||
boolean overwrite=true; // the default
|
||||
|
||||
Boolean overwritePending = null;
|
||||
Boolean overwriteCommitted = null;
|
||||
for (int i=0; i<parser.getAttributeCount(); i++) {
|
||||
String attrName = parser.getAttributeLocalName(i);
|
||||
String attrVal = parser.getAttributeValue(i);
|
||||
if (OVERWRITE.equals(attrName)) {
|
||||
overwrite = StrUtils.parseBoolean(attrVal);
|
||||
// } else if (MODE.equals(attrName)) {
|
||||
// addCmd.mode = SolrPluginUtils.parseAndValidateFieldModes(attrVal,schema);
|
||||
} else if (ALLOW_DUPS.equals(attrName)) {
|
||||
overwrite = !StrUtils.parseBoolean(attrVal);
|
||||
} else if ( OVERWRITE_PENDING.equals(attrName) ) {
|
||||
overwritePending = StrUtils.parseBoolean(attrVal);
|
||||
} else if ( OVERWRITE_COMMITTED.equals(attrName) ) {
|
||||
overwriteCommitted = StrUtils.parseBoolean(attrVal);
|
||||
} else {
|
||||
log.warning("Unknown attribute id in add:" + attrName);
|
||||
}
|
||||
}
|
||||
|
||||
// check if these flags are set
|
||||
if( overwritePending != null && overwriteCommitted != null ) {
|
||||
if( overwritePending != overwriteCommitted ) {
|
||||
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,
|
||||
"can't have different values for 'overwritePending' and 'overwriteCommitted'" );
|
||||
}
|
||||
overwrite=overwritePending;
|
||||
}
|
||||
addCmd.overwriteCommitted = overwrite;
|
||||
addCmd.overwritePending = overwrite;
|
||||
addCmd.allowDups = !overwrite;
|
||||
}
|
||||
else if ("doc".equals(currTag)) {
|
||||
log.finest("adding doc...");
|
||||
SolrInputDocument doc = readDoc( parser );
|
||||
processor.processAdd( addCmd, doc );
|
||||
}
|
||||
else if ( COMMIT.equals(currTag) || OPTIMIZE.equals(currTag)) {
|
||||
log.finest("parsing " + currTag);
|
||||
|
||||
CommitUpdateCommand cmd = new CommitUpdateCommand(OPTIMIZE.equals(currTag));
|
||||
|
||||
boolean sawWaitSearcher = false, sawWaitFlush = false;
|
||||
for (int i = 0; i < parser.getAttributeCount(); i++) {
|
||||
String attrName = parser.getAttributeLocalName(i);
|
||||
String attrVal = parser.getAttributeValue(i);
|
||||
if (WAIT_FLUSH.equals(attrName)) {
|
||||
cmd.waitFlush = StrUtils.parseBoolean(attrVal);
|
||||
sawWaitFlush = true;
|
||||
} else if (WAIT_SEARCHER.equals(attrName)) {
|
||||
cmd.waitSearcher = StrUtils.parseBoolean(attrVal);
|
||||
sawWaitSearcher = true;
|
||||
} else {
|
||||
log.warning("unexpected attribute commit/@" + attrName);
|
||||
}
|
||||
}
|
||||
|
||||
// If waitFlush is specified and waitSearcher wasn't, then
|
||||
// clear waitSearcher.
|
||||
if (sawWaitFlush && !sawWaitSearcher) {
|
||||
cmd.waitSearcher = false;
|
||||
}
|
||||
processor.processCommit( cmd );
|
||||
} // end commit
|
||||
else if (DELETE.equals(currTag)) {
|
||||
log.finest("parsing delete");
|
||||
processDelete( processor, parser);
|
||||
} // end delete
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @since solr 1.3
|
||||
*/
|
||||
void processDelete(UpdateRequestProcessor processor, XMLStreamReader parser) throws XMLStreamException, IOException
|
||||
{
|
||||
// Parse the command
|
||||
DeleteUpdateCommand deleteCmd = new DeleteUpdateCommand();
|
||||
deleteCmd.fromPending = true;
|
||||
deleteCmd.fromCommitted = true;
|
||||
for (int i = 0; i < parser.getAttributeCount(); i++) {
|
||||
String attrName = parser.getAttributeLocalName(i);
|
||||
String attrVal = parser.getAttributeValue(i);
|
||||
if ("fromPending".equals(attrName)) {
|
||||
deleteCmd.fromPending = StrUtils.parseBoolean(attrVal);
|
||||
} else if ("fromCommitted".equals(attrName)) {
|
||||
deleteCmd.fromCommitted = StrUtils.parseBoolean(attrVal);
|
||||
} else {
|
||||
log.warning("unexpected attribute delete/@" + attrName);
|
||||
}
|
||||
}
|
||||
|
||||
String val = null;
|
||||
String mode = null;
|
||||
while (true) {
|
||||
int event = parser.next();
|
||||
switch (event) {
|
||||
case XMLStreamConstants.START_ELEMENT:
|
||||
mode = parser.getLocalName();
|
||||
if (!("id".equals(mode) || "query".equals(mode))) {
|
||||
log.warning("unexpected XML tag /delete/" + mode);
|
||||
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
|
||||
"unexpected XML tag /delete/" + mode);
|
||||
}
|
||||
break;
|
||||
|
||||
case XMLStreamConstants.END_ELEMENT:
|
||||
String currTag = parser.getLocalName();
|
||||
if ("id".equals(currTag)) {
|
||||
deleteCmd.id = val;
|
||||
} else if ("query".equals(currTag)) {
|
||||
deleteCmd.query = val;
|
||||
} else {
|
||||
log.warning("unexpected XML tag /delete/" + currTag);
|
||||
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
|
||||
"unexpected XML tag /delete/" + currTag);
|
||||
}
|
||||
processor.processDelete( deleteCmd );
|
||||
return;
|
||||
|
||||
case XMLStreamConstants.CHARACTERS:
|
||||
val = parser.getText();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Given the input stream, read a document
|
||||
*
|
||||
* @since solr 1.3
|
||||
*/
|
||||
SolrInputDocument readDoc(XMLStreamReader parser) throws XMLStreamException {
|
||||
SolrInputDocument doc = new SolrInputDocument();
|
||||
|
||||
String attrName = "";
|
||||
for (int i = 0; i < parser.getAttributeCount(); i++) {
|
||||
attrName = parser.getAttributeLocalName(i);
|
||||
if ("boost".equals(attrName)) {
|
||||
doc.setBoost( null, Float.parseFloat(parser.getAttributeValue(i)) );
|
||||
} else {
|
||||
log.warning("Unknown attribute doc/@" + attrName);
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder text = new StringBuilder();
|
||||
String name = null;
|
||||
Float boost = null;
|
||||
boolean isNull = false;
|
||||
while (true) {
|
||||
int event = parser.next();
|
||||
switch (event) {
|
||||
// Add everything to the text
|
||||
case XMLStreamConstants.SPACE:
|
||||
case XMLStreamConstants.CDATA:
|
||||
case XMLStreamConstants.CHARACTERS:
|
||||
text.append( parser.getText() );
|
||||
break;
|
||||
|
||||
case XMLStreamConstants.END_ELEMENT:
|
||||
if ("doc".equals(parser.getLocalName())) {
|
||||
return doc;
|
||||
}
|
||||
else if ("field".equals(parser.getLocalName())) {
|
||||
if (!isNull) {
|
||||
doc.addField(name, text.toString() );
|
||||
if(boost != null) {
|
||||
doc.setBoost( name, boost );
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case XMLStreamConstants.START_ELEMENT:
|
||||
text.setLength(0);
|
||||
String localName = parser.getLocalName();
|
||||
if (!"field".equals(localName)) {
|
||||
log.warning("unexpected XML tag doc/" + localName);
|
||||
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
|
||||
"unexpected XML tag doc/" + localName);
|
||||
}
|
||||
boost = null;
|
||||
String attrVal = "";
|
||||
for (int i = 0; i < parser.getAttributeCount(); i++) {
|
||||
attrName = parser.getAttributeLocalName(i);
|
||||
attrVal = parser.getAttributeValue(i);
|
||||
if ("name".equals(attrName)) {
|
||||
name = attrVal;
|
||||
} else if ("boost".equals(attrName)) {
|
||||
boost = Float.parseFloat(attrVal);
|
||||
} else if ("null".equals(attrName)) {
|
||||
isNull = StrUtils.parseBoolean(attrVal);
|
||||
} else {
|
||||
log.warning("Unknown attribute doc/field/@" + attrName);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @since solr 1.2
|
||||
*/
|
||||
public NamedList<Object> update( SolrQueryRequest req, SolrCore core, Reader reader) throws Exception {
|
||||
XMLStreamReader parser = inputFactory.createXMLStreamReader(reader);
|
||||
return processUpdate( req, core, parser);
|
||||
}
|
||||
|
||||
/**
|
||||
* A Convenience method for getting back a simple XML string indicating
|
||||
* success or failure from an XML formated Update (from the Reader)
|
||||
*
|
||||
* @since solr 1.2
|
||||
*/
|
||||
@Deprecated
|
||||
public void doLegacyUpdate(Reader input, Writer output) {
|
||||
try {
|
||||
SolrCore core = SolrCore.getSolrCore();
|
||||
SolrParams params = new MapSolrParams( new HashMap<String, String>() );
|
||||
SolrQueryRequestBase req = new SolrQueryRequestBase( core, params ) {};
|
||||
this.update( req, SolrCore.getSolrCore(), input);
|
||||
output.write("<result status=\"0\"></result>");
|
||||
}
|
||||
catch (Exception ex) {
|
||||
try {
|
||||
XML.writeXML(output, "result", SolrException.toStr(ex), "status", "1");
|
||||
} catch (Exception ee) {
|
||||
log.severe("Error writing to output stream: " + ee);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////// SolrInfoMBeans methods //////////////////////
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Add documents with XML";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getVersion() {
|
||||
return "$Revision$";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSourceId() {
|
||||
return "$Id$";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSource() {
|
||||
return "$URL$";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
/**
|
||||
* 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.handler;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.apache.solr.common.SolrInputDocument;
|
||||
import org.apache.solr.common.util.NamedList;
|
||||
import org.apache.solr.core.SolrCore;
|
||||
import org.apache.solr.request.SolrQueryRequest;
|
||||
import org.apache.solr.schema.IndexSchema;
|
||||
import org.apache.solr.schema.SchemaField;
|
||||
import org.apache.solr.update.AddUpdateCommand;
|
||||
import org.apache.solr.update.CommitUpdateCommand;
|
||||
import org.apache.solr.update.DeleteUpdateCommand;
|
||||
import org.apache.solr.update.DocumentBuilder;
|
||||
import org.apache.solr.update.UpdateHandler;
|
||||
|
||||
|
||||
/**
|
||||
* This is a good place for subclassed update handlers to process the document before it is
|
||||
* indexed. You may wish to add/remove fields or check if the requested user is allowed to
|
||||
* update the given document...
|
||||
*
|
||||
* Perhaps you continue adding an error message (without indexing the document)...
|
||||
* perhaps you throw an error and halt indexing (remove anything already indexed??)
|
||||
*
|
||||
* This implementation (the default) passes the request command (as is) to the updateHandler
|
||||
* and adds debug info to the response.
|
||||
*
|
||||
* @author ryan
|
||||
* @since solr 1.3
|
||||
*/
|
||||
public class UpdateRequestProcessor
|
||||
{
|
||||
public static Logger log = Logger.getLogger(UpdateRequestProcessor.class.getName());
|
||||
|
||||
protected final SolrQueryRequest req;
|
||||
protected final SolrCore core;
|
||||
protected final IndexSchema schema;
|
||||
protected final UpdateHandler updateHandler;
|
||||
protected final DocumentBuilder builder;
|
||||
protected final SchemaField uniqueKeyField;
|
||||
protected final long startTime;
|
||||
protected final NamedList<Object> response;
|
||||
|
||||
public UpdateRequestProcessor( SolrQueryRequest req )
|
||||
{
|
||||
this.req = req;
|
||||
|
||||
core = req.getCore();
|
||||
schema = core.getSchema();
|
||||
updateHandler = core.getUpdateHandler();
|
||||
builder = new DocumentBuilder( schema );
|
||||
uniqueKeyField = schema.getUniqueKeyField();
|
||||
startTime = System.currentTimeMillis();
|
||||
|
||||
// A place to put our output
|
||||
response = new NamedList<Object>();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The response information
|
||||
*/
|
||||
public NamedList<Object> getResponse()
|
||||
{
|
||||
return response;
|
||||
}
|
||||
|
||||
public void processDelete( DeleteUpdateCommand cmd ) throws IOException
|
||||
{
|
||||
long start = System.currentTimeMillis();
|
||||
if( cmd.id != null ) {
|
||||
updateHandler.delete( cmd );
|
||||
long now = System.currentTimeMillis();
|
||||
log.info("delete(id " + cmd.id + ") 0 " + (now - start) + " ["+(now-startTime)+"]");
|
||||
|
||||
response.add( "delete", cmd.id );
|
||||
}
|
||||
else {
|
||||
// TODO? if cmd.query == "*:* it should do something special
|
||||
|
||||
updateHandler.deleteByQuery( cmd );
|
||||
long now = System.currentTimeMillis();
|
||||
log.info("deleteByQuery(id " + cmd.query + ") 0 " + (now - start) + " ["+(now-startTime)+"]");
|
||||
|
||||
response.add( "deleteByQuery", cmd.id );
|
||||
}
|
||||
}
|
||||
|
||||
public void processCommit( CommitUpdateCommand cmd ) throws IOException
|
||||
{
|
||||
updateHandler.commit(cmd);
|
||||
response.add(cmd.optimize ? "optimize" : "commit", "");
|
||||
long now = System.currentTimeMillis();
|
||||
|
||||
if (cmd.optimize) {
|
||||
log.info("optimize 0 " + (now - startTime)+ " ["+(now-startTime)+"]");
|
||||
}
|
||||
else {
|
||||
log.info("commit 0 " + (now - startTime)+ " ["+(now-startTime)+"]");
|
||||
}
|
||||
}
|
||||
|
||||
// TODO -- in the future, the update command should just hold onto a SolrDocument
|
||||
public void processAdd( AddUpdateCommand cmd, SolrInputDocument doc ) throws IOException
|
||||
{
|
||||
long start = System.currentTimeMillis();
|
||||
Object id = null;
|
||||
if (uniqueKeyField != null) {
|
||||
id = doc.getFieldValue( uniqueKeyField.getName() );
|
||||
}
|
||||
cmd.doc = builder.build( doc );
|
||||
updateHandler.addDoc(cmd);
|
||||
response.add( "added", id );
|
||||
|
||||
long now = System.currentTimeMillis();
|
||||
log.info("added id={" + id + "} in " + (now - start) + "ms ["+(now-startTime)+"]");
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue