You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/26 16:48:56 UTC
svn commit: r1052905 - in /lucene/dev/trunk/solr:
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/
src/java/org/apache/solr/handler/ src/java/org/apache/solr/update/
src/test/org/apache/solr/update/
Author: yonik
Date: Sun Dec 26 15:48:55 2010
New Revision: 1052905
URL: http://svn.apache.org/viewvc?rev=1052905&view=rev
Log:
SOLR-1930: remove solr deprecations - delete.fromCommitted/fromPending
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonLoader.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java
lucene/dev/trunk/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/trunk/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java Sun Dec 26 15:48:55 2010
@@ -86,8 +86,6 @@ public class SolrWriter {
log.info("Deleting document: " + id);
DeleteUpdateCommand delCmd = new DeleteUpdateCommand();
delCmd.id = id.toString();
- delCmd.fromPending = true;
- delCmd.fromCommitted = true;
processor.processDelete(delCmd);
} catch (IOException e) {
log.error("Exception while deleteing: " + id, e);
@@ -162,8 +160,6 @@ public class SolrWriter {
log.info("Deleting documents from Solr with query: " + query);
DeleteUpdateCommand delCmd = new DeleteUpdateCommand();
delCmd.query = query;
- delCmd.fromCommitted = true;
- delCmd.fromPending = true;
processor.processDelete(delCmd);
} catch (IOException e) {
log.error("Exception while deleting by query: " + query, e);
@@ -192,8 +188,6 @@ public class SolrWriter {
try {
DeleteUpdateCommand deleteCommand = new DeleteUpdateCommand();
deleteCommand.query = "*:*";
- deleteCommand.fromCommitted = true;
- deleteCommand.fromPending = true;
processor.processDelete(deleteCommand);
} catch (IOException e) {
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java Sun Dec 26 15:48:55 2010
@@ -123,8 +123,6 @@ public class BinaryUpdateRequestHandler
} else {
delcmd.query = s;
}
- delcmd.fromCommitted = true;
- delcmd.fromPending = true;
processor.processDelete(delcmd);
}
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonLoader.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonLoader.java Sun Dec 26 15:48:55 2010
@@ -133,7 +133,6 @@ class JsonLoader extends ContentStreamLo
assertNextEvent( js, JSONParser.OBJECT_START );
DeleteUpdateCommand cmd = new DeleteUpdateCommand();
- cmd.fromCommitted = cmd.fromPending = true; // TODO? enable this?
while( true ) {
int ev = js.nextEvent();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java Sun Dec 26 15:48:55 2010
@@ -190,15 +190,14 @@ class XMLLoader extends ContentStreamLoa
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);
+ // deprecated
} else if ("fromCommitted".equals(attrName)) {
- deleteCmd.fromCommitted = StrUtils.parseBoolean(attrVal);
+ // deprecated
} else {
XmlUpdateRequestHandler.log.warn("unexpected attribute delete/@" + attrName);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java Sun Dec 26 15:48:55 2010
@@ -22,8 +22,6 @@ package org.apache.solr.update;
public class DeleteUpdateCommand extends UpdateCommand {
public String id; // external (printable) id, for delete-by-id
public String query; // query string for delete-by-query
- public boolean fromPending;
- public boolean fromCommitted;
public DeleteUpdateCommand() {
super("delete");
@@ -34,8 +32,6 @@ public class DeleteUpdateCommand extends
sb.append(':');
if (id!=null) sb.append("id=").append(id);
else sb.append("query=`").append(query).append('`');
- sb.append(",fromPending=").append(fromPending);
- sb.append(",fromCommitted=").append(fromCommitted);
return sb.toString();
}
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java Sun Dec 26 15:48:55 2010
@@ -270,17 +270,6 @@ public class DirectUpdateHandler2 extend
deleteByIdCommands.incrementAndGet();
deleteByIdCommandsCumulative.incrementAndGet();
- if (!cmd.fromPending && !cmd.fromCommitted) {
- numErrors.incrementAndGet();
- numErrorsCumulative.incrementAndGet();
- throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"meaningless command: " + cmd);
- }
- if (!cmd.fromPending || !cmd.fromCommitted) {
- numErrors.incrementAndGet();
- numErrorsCumulative.incrementAndGet();
- throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"operation not supported" + cmd);
- }
-
iwCommit.lock();
try {
openWriter();
@@ -300,17 +289,6 @@ public class DirectUpdateHandler2 extend
deleteByQueryCommands.incrementAndGet();
deleteByQueryCommandsCumulative.incrementAndGet();
- if (!cmd.fromPending && !cmd.fromCommitted) {
- numErrors.incrementAndGet();
- numErrorsCumulative.incrementAndGet();
- throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"meaningless command: " + cmd);
- }
- if (!cmd.fromPending || !cmd.fromCommitted) {
- numErrors.incrementAndGet();
- numErrorsCumulative.incrementAndGet();
- throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"operation not supported" + cmd);
- }
-
boolean madeIt=false;
boolean delAll=false;
try {
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1052905&r1=1052904&r2=1052905&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Sun Dec 26 15:48:55 2010
@@ -354,8 +354,6 @@ public class DirectUpdateHandlerTest ext
// Delete the document
DeleteUpdateCommand cmd = new DeleteUpdateCommand();
cmd.id = id;
- cmd.fromCommitted = true;
- cmd.fromPending = true;
updater.delete(cmd);
}