You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2017/02/22 16:00:00 UTC
svn commit: r1784034 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/
main/java/org/apache/jackrabbit/oak/plugins/document/mongo/
main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
test/java/org/apac...
Author: reschke
Date: Wed Feb 22 15:59:59 2017
New Revision: 1784034
URL: http://svn.apache.org/viewvc?rev=1784034&view=rev
Log:
OAK-5741: DocumentStore UpdateOp: support removal of properties
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java Wed Feb 22 15:59:59 2017
@@ -111,6 +111,17 @@ public class Document implements CacheVa
}
/**
+ * Removes the given <code>key</code>.
+ *
+ * @param key the key.
+ * @return the previous value or <code>null</code> if there was none.
+ */
+ @CheckForNull
+ public Object remove(String key) {
+ return data.remove(key);
+ }
+
+ /**
* @return a Set view of the keys contained in this document.
*/
public Set<String> keySet() {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java Wed Feb 22 15:59:59 2017
@@ -160,6 +160,19 @@ public final class UpdateOp {
}
/**
+ * Remove a property.
+ *
+ * @param property the property name
+ */
+ public void remove(@Nonnull String property) {
+ if (Document.ID.equals(property)) {
+ throw new IllegalArgumentException(Document.ID + " must not be removed");
+ }
+ Operation op = new Operation(Operation.Type.REMOVE, null);
+ changes.put(new Key(property, null), op);
+ }
+
+ /**
* Remove a map entry.
* The property is a map of revisions / values.
*
@@ -393,8 +406,13 @@ public final class UpdateOp {
* Remove the sub-key / value pair.
* The value in the stored node is a map.
*/
- REMOVE_MAP_ENTRY
+ REMOVE_MAP_ENTRY,
+ /**
+ * Remove the value.
+ * The sub-key is not used.
+ */
+ REMOVE
}
@@ -421,17 +439,18 @@ public final class UpdateOp {
public Operation getReverse() {
Operation reverse = null;
switch (type) {
- case INCREMENT:
- reverse = new Operation(Type.INCREMENT, -(Long) value);
- break;
- case SET:
- case MAX:
- case REMOVE_MAP_ENTRY:
- // nothing to do
- break;
- case SET_MAP_ENTRY:
- reverse = new Operation(Type.REMOVE_MAP_ENTRY, null);
- break;
+ case INCREMENT:
+ reverse = new Operation(Type.INCREMENT, -(Long) value);
+ break;
+ case SET:
+ case MAX:
+ case REMOVE_MAP_ENTRY:
+ case REMOVE:
+ // nothing to do
+ break;
+ case SET_MAP_ENTRY:
+ reverse = new Operation(Type.REMOVE_MAP_ENTRY, null);
+ break;
}
return reverse;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java Wed Feb 22 15:59:59 2017
@@ -55,6 +55,10 @@ public class UpdateUtils {
doc.put(k.toString(), op.value);
break;
}
+ case REMOVE: {
+ doc.remove(k.toString());
+ break;
+ }
case MAX: {
Comparable newValue = (Comparable) op.value;
Object old = doc.get(k.toString());
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Wed Feb 22 15:59:59 2017
@@ -1147,6 +1147,7 @@ public class MongoDocumentStore implemen
}
break;
}
+ case REMOVE:
case REMOVE_MAP_ENTRY:
// nothing to do for new entries
break;
@@ -1528,6 +1529,7 @@ public class MongoDocumentStore implemen
incUpdates.append(k.toString(), op.value);
break;
}
+ case REMOVE:
case REMOVE_MAP_ENTRY: {
unsetUpdates.append(k.toString(), "1");
break;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java Wed Feb 22 15:59:59 2017
@@ -121,7 +121,7 @@ public class RDBDocumentSerializer {
sb.append("\"=\",");
} else if (op.type == UpdateOp.Operation.Type.MAX) {
sb.append("\"M\",");
- } else if (op.type == UpdateOp.Operation.Type.REMOVE_MAP_ENTRY) {
+ } else if (op.type == UpdateOp.Operation.Type.REMOVE || op.type == UpdateOp.Operation.Type.REMOVE_MAP_ENTRY) {
sb.append("\"*\",");
} else {
throw new DocumentStoreException("Can't serialize " + update.toString() + " for JSON append");
@@ -266,7 +266,7 @@ public class RDBDocumentSerializer {
}
} else if ("*".equals(opcode)) {
if (rev == null) {
- throw new DocumentStoreException("unexpected operation " + op + " in: " + updateString);
+ doc.remove(key);
} else {
@SuppressWarnings("unchecked")
Map<Revision, Object> m = (Map<Revision, Object>) old;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1784034&r1=1784033&r2=1784034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java Wed Feb 22 15:59:59 2017
@@ -134,6 +134,17 @@ public class BasicDocumentStoreTest exte
assertEquals(NodeDocument.HAS_BINARY_VAL, nd.get(NodeDocument.HAS_BINARY_FLAG));
assertFalse(nd.wasDeletedOnce());
assertTrue(nd.hasBinary());
+
+ // remove
+ up = new UpdateOp(id, false);
+ up.remove(NodeDocument.DELETED_ONCE);
+ up.remove(NodeDocument.HAS_BINARY_FLAG);
+ super.ds.findAndUpdate(Collection.NODES, up);
+
+ super.ds.invalidateCache();
+ nd = super.ds.find(Collection.NODES, id, 0);
+ assertNull(nd.get(NodeDocument.DELETED_ONCE));
+ assertNull(nd.get(NodeDocument.HAS_BINARY_FLAG));
}
@Test