You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2014/04/18 01:53:33 UTC
svn commit: r1588391 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
Author: erick
Date: Thu Apr 17 23:53:32 2014
New Revision: 1588391
URL: http://svn.apache.org/r1588391
Log:
SOLR-3862 add 'remove' as update option for atomically removing a value from a multivalued field. Note that revision 1588385 is for this patch on trunk
Added:
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
- copied unchanged from r1588385, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1588391&r1=1588390&r2=1588391&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Apr 17 23:53:32 2014
@@ -56,6 +56,9 @@ Other Changes
* SOLR-5987: Add "collection" to UpdateParams. (Mark Miller, Greg Solovyev)
+* SOLR-3862: Add remove" as update option for atomically removing a value
+ from a multivalued field (Jim Musli, Steven Bower, Alaknantha via Erick Erickson)
+
================== 4.8.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1588391&r1=1588390&r2=1588391&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Thu Apr 17 23:53:32 2014
@@ -905,49 +905,34 @@ public class DistributedUpdateProcessor
IndexSchema schema = cmd.getReq().getSchema();
for (SolrInputField sif : sdoc.values()) {
- Object val = sif.getValue();
+ Object val = sif.getValue();
if (val instanceof Map) {
for (Entry<String,Object> entry : ((Map<String,Object>) val).entrySet()) {
String key = entry.getKey();
Object fieldVal = entry.getValue();
boolean updateField = false;
- if ("add".equals(key)) {
- updateField = true;
- oldDoc.addField( sif.getName(), fieldVal, sif.getBoost());
- } else if ("set".equals(key)) {
- updateField = true;
- oldDoc.setField(sif.getName(), fieldVal, sif.getBoost());
- } else if ("inc".equals(key)) {
- updateField = true;
- SolrInputField numericField = oldDoc.get(sif.getName());
- if (numericField == null) {
- oldDoc.setField(sif.getName(), fieldVal, sif.getBoost());
- } else {
- // TODO: fieldtype needs externalToObject?
- String oldValS = numericField.getFirstValue().toString();
- SchemaField sf = schema.getField(sif.getName());
- BytesRef term = new BytesRef();
- sf.getType().readableToIndexed(oldValS, term);
- Object oldVal = sf.getType().toObject(sf, term);
-
- String fieldValS = fieldVal.toString();
- Number result;
- if (oldVal instanceof Long) {
- result = ((Long) oldVal).longValue() + Long.parseLong(fieldValS);
- } else if (oldVal instanceof Float) {
- result = ((Float) oldVal).floatValue() + Float.parseFloat(fieldValS);
- } else if (oldVal instanceof Double) {
- result = ((Double) oldVal).doubleValue() + Double.parseDouble(fieldValS);
- } else {
- // int, short, byte
- result = ((Integer) oldVal).intValue() + Integer.parseInt(fieldValS);
- }
-
- oldDoc.setField(sif.getName(), result, sif.getBoost());
- }
-
+ switch (key) {
+ case "add":
+ updateField = true;
+ oldDoc.addField(sif.getName(), fieldVal, sif.getBoost());
+ break;
+ case "set":
+ updateField = true;
+ oldDoc.setField(sif.getName(), fieldVal, sif.getBoost());
+ break;
+ case "remove":
+ updateField = true;
+ doRemove(oldDoc, sif, fieldVal);
+ break;
+ case "inc":
+ updateField = true;
+ doInc(oldDoc, schema, sif, fieldVal);
+ break;
+ default:
+ //Perhaps throw an error here instead?
+ log.warn("Unknown operation for the an atomic update, operation ignored: " + key);
+ break;
}
-
// validate that the field being modified is not the id field.
if (updateField && idField.getName().equals(sif.getName())) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Invalid update of id field: " + sif);
@@ -965,9 +950,52 @@ public class DistributedUpdateProcessor
return true;
}
+ private void doInc(SolrInputDocument oldDoc, IndexSchema schema, SolrInputField sif, Object fieldVal) {
+ SolrInputField numericField = oldDoc.get(sif.getName());
+ if (numericField == null) {
+ oldDoc.setField(sif.getName(), fieldVal, sif.getBoost());
+ } else {
+ // TODO: fieldtype needs externalToObject?
+ String oldValS = numericField.getFirstValue().toString();
+ SchemaField sf = schema.getField(sif.getName());
+ BytesRef term = new BytesRef();
+ sf.getType().readableToIndexed(oldValS, term);
+ Object oldVal = sf.getType().toObject(sf, term);
+
+ String fieldValS = fieldVal.toString();
+ Number result;
+ if (oldVal instanceof Long) {
+ result = ((Long) oldVal).longValue() + Long.parseLong(fieldValS);
+ } else if (oldVal instanceof Float) {
+ result = ((Float) oldVal).floatValue() + Float.parseFloat(fieldValS);
+ } else if (oldVal instanceof Double) {
+ result = ((Double) oldVal).doubleValue() + Double.parseDouble(fieldValS);
+ } else {
+ // int, short, byte
+ result = ((Integer) oldVal).intValue() + Integer.parseInt(fieldValS);
+ }
+
+ oldDoc.setField(sif.getName(), result, sif.getBoost());
+ }
+ }
+
+ private void doRemove(SolrInputDocument oldDoc, SolrInputField sif, Object fieldVal) {
+ final String name = sif.getName();
+ SolrInputField existingField = oldDoc.get(name);
+ if (existingField != null) {
+ final Collection<Object> original = existingField.getValues();
+ if (fieldVal instanceof Collection) {
+ original.removeAll((Collection) fieldVal);
+ } else {
+ original.remove(fieldVal);
+ }
+
+ oldDoc.setField(name, original);
+
+ }
+ }
-
@Override
public void processDelete(DeleteUpdateCommand cmd) throws IOException {
updateCommand = cmd;