Author: mreutegg
Date: Wed Nov 16 15:15:49 2016
New Revision: 1769997
URL: http://svn.apache.org/viewvc?rev=1769997&view=rev
Log:
OAK-4952: reject UpdateOp with set operation for _id, clarify API, add tests,
fix implementations
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.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/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndInvalidateIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndUpdateIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ResurrectNodeAfterRevisionGCTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ValueMapTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapperTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
Wed Nov 16 15:15:49 2016
@@ -217,7 +217,6 @@ class Checkpoints {
private void createIfNotExist() {
if (store.find(Collection.SETTINGS, ID) == null) {
UpdateOp updateOp = new UpdateOp(ID, true);
- updateOp.set(Document.ID, ID);
store.createOrUpdate(Collection.SETTINGS, updateOp);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Wed Nov 16 15:15:49 2016
@@ -448,7 +448,6 @@ public class ClusterNodeInfo {
ClusterNodeInfo clusterNode = createInstance(store, machineId,
instanceId, configuredClusterId, i == 0);
String key = String.valueOf(clusterNode.id);
UpdateOp update = new UpdateOp(key, true);
- update.set(ID, key);
update.set(MACHINE_ID_KEY, clusterNode.machineId);
update.set(INSTANCE_ID_KEY, clusterNode.instanceId);
if (updateLease) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java
Wed Nov 16 15:15:49 2016
@@ -215,9 +215,6 @@ class ClusterViewDocument {
// tries to create this first one simultaneously - so we use
// 'create'
- // going via 'create' requires ID to be set again (not only in new
- // UpdateOp(id,isNew)):
- updateOp.set(Document.ID, CLUSTERVIEW_DOC_ID);
ArrayList<UpdateOp> updateOps = new ArrayList<UpdateOp>();
newViewSeqNum = 1L;
updateOp.setNew(true); // paranoia as that's already set above
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
Wed Nov 16 15:15:49 2016
@@ -401,7 +401,6 @@ public class DocumentNodeState extends A
UpdateOp asOperation(@Nonnull Revision revision) {
String id = Utils.getIdFromPath(path);
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
if (Utils.isLongPath(path)) {
op.set(NodeDocument.PATH, path);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
Wed Nov 16 15:15:49 2016
@@ -295,7 +295,6 @@ public final class JournalEntry extends
UpdateOp asUpdateOp(@Nonnull Revision revision) {
String id = asId(revision);
UpdateOp op = new UpdateOp(id, true);
- op.set(ID, id);
op.set(CHANGES, getChanges().serialize());
// OAK-3085 : introduce a timestamp property
// for later being used by OAK-3001
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java
Wed Nov 16 15:15:49 2016
@@ -107,7 +107,6 @@ public class JournalGarbageCollector {
private void updateTailTimestamp(long gcOlderThan) {
UpdateOp op = new UpdateOp(JOURNAL_GC_ID, true);
- op.set(Document.ID, JOURNAL_GC_ID);
op.max(TAIL_TIMESTAMP, gcOlderThan);
ns.getDocumentStore().createOrUpdate(SETTINGS, op);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
Wed Nov 16 15:15:49 2016
@@ -310,7 +310,6 @@ class SplitOperations {
String prevPath = Utils.getPreviousPathFor(path, h,
entry.getKey() + 1);
String prevId = Utils.getIdFromPath(prevPath);
UpdateOp intermediate = new UpdateOp(prevId, true);
- intermediate.set(Document.ID, prevId);
if (Utils.isLongPath(prevPath)) {
intermediate.set(NodeDocument.PATH, prevPath);
}
@@ -347,7 +346,6 @@ class SplitOperations {
setPrevious(main, new Range(high, low, 0));
String oldPath = Utils.getPreviousPathFor(path, high, 0);
UpdateOp old = new UpdateOp(Utils.getIdFromPath(oldPath), true);
- old.set(Document.ID, old.getId());
if (Utils.isLongPath(oldPath)) {
old.set(NodeDocument.PATH, oldPath);
}
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=1769997&r1=1769996&r2=1769997&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 Nov 16 15:15:49 2016
@@ -194,16 +194,13 @@ public final class UpdateOp {
/**
* Set the property to the given String value.
* <p>
- * Note that {@link Document#ID} does not need to be set using this method;
+ * Note that {@link Document#ID} must not be set using this method;
* it is sufficiently specified by the id parameter set in the constructor.
*
* @param property the property name
* @param value the value
* @throws IllegalArgumentException
- * if an attempt is made to set {@link Document#ID} to a value
- * inconsistent with the id parameter set in the constructor
- * (note that setting the ID here is redundant and might be
- * rejected in future versions)
+ * if an attempt is made to set {@link Document#ID}.
*/
public void set(String property, String value) {
internalSet(property, value);
@@ -348,9 +345,9 @@ public final class UpdateOp {
}
private void internalSet(String property, Object value) {
- if (Document.ID.equals(property) && !id.equals(value.toString())) {
+ if (Document.ID.equals(property)) {
throw new IllegalArgumentException(
- "updateOp.id (" + id + ") and set operation on " +
Document.ID + " (" + value + ") disagree");
+ "updateOp.id (" + id + ") must not set " + Document.ID);
}
Operation op = new Operation(Operation.Type.SET, value);
changes.put(new Key(property, null), op);
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=1769997&r1=1769996&r2=1769997&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 Nov 16 15:15:49 2016
@@ -1556,11 +1556,6 @@ public class MongoDocumentStore implemen
// other updates
for (Entry<Key, Operation> entry : updateOp.getChanges().entrySet()) {
Key k = entry.getKey();
- if (!includeId && k.getName().equals(Document.ID)) {
- // TODO: remove once set _id is prohibited (OAK-4952)
- // avoid exception "Mod on _id not allowed"
- continue;
- }
Operation op = entry.getValue();
switch (op.type) {
case SET:
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=1769997&r1=1769996&r2=1769997&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 Nov 16 15:15:49 2016
@@ -67,7 +67,6 @@ public class BasicDocumentStoreTest exte
// add
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
super.ds.invalidateCache();
assertNotNull(super.ds.find(Collection.NODES, id));
@@ -93,15 +92,13 @@ public class BasicDocumentStoreTest exte
}
@Test
- public void testConflictingId() {
- String id = this.getClass().getName() + ".testConflictingId";
+ public void testSetId() {
+ String id = this.getClass().getName() + ".testSetId";
UpdateOp up = new UpdateOp(id, true);
try {
- up.set("_id", id + "x");
+ up.set("_id", id);
} catch (IllegalArgumentException expected) {
- } finally {
- removeMe.add(id);
}
}
@@ -117,12 +114,10 @@ public class BasicDocumentStoreTest exte
// create
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
assertNull(super.ds.createOrUpdate(Collection.NODES, up));
// update
up = new UpdateOp(id, true);
- up.set("_id", id);
assertNotNull(super.ds.createOrUpdate(Collection.NODES, up));
removeMe.add(id);
}
@@ -160,7 +155,6 @@ public class BasicDocumentStoreTest exte
// add
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
assertTrue(super.ds.create(Collection.JOURNAL,
Collections.singletonList(up)));
}
@@ -182,93 +176,78 @@ public class BasicDocumentStoreTest exte
// add
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set(existingProp, "lock");
up.setMapEntry(existingRevisionProp, r, "lock");
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
// updates
up = new UpdateOp(id, false);
- up.set("_id", id);
up.notEquals(nonExistingProp, "none");
NodeDocument result = super.ds.findAndUpdate(Collection.NODES, up);
assertNotNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(nonExistingProp, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNotNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.notEquals(nonExistingRevisionProp, r, "none");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNotNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(nonExistingRevisionProp, r, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNotNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingProp, "none");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingProp, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingRevisionProp, r, "none");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingRevisionProp, r, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.notEquals(existingProp, "lock");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingProp, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.notEquals(existingRevisionProp, r, "lock");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingRevisionProp, r, null);
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingProp, "lock");
up.set(existingProp, "none");
result = super.ds.findAndUpdate(Collection.NODES, up);
assertNotNull(result);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals(existingRevisionProp, r, "lock");
up.setMapEntry(existingRevisionProp, r, "none");
result = super.ds.findAndUpdate(Collection.NODES, up);
@@ -289,7 +268,6 @@ public class BasicDocumentStoreTest exte
try {
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.equals("foo", "bar");
super.ds.create(Collection.NODES, Collections.singletonList(up));
fail("conditional create should fail");
@@ -299,13 +277,11 @@ public class BasicDocumentStoreTest exte
}
UpdateOp cup = new UpdateOp(id, true);
- cup.set("_id", id);
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(cup)));
removeMe.add(id);
try {
UpdateOp up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals("foo", "bar");
super.ds.createOrUpdate(Collection.NODES, up);
fail("conditional createOrUpdate should fail");
@@ -316,7 +292,6 @@ public class BasicDocumentStoreTest exte
try {
UpdateOp up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals("foo", "bar");
super.ds.createOrUpdate(Collection.NODES,
Collections.singletonList(up));
fail("conditional createOrUpdate should fail");
@@ -327,7 +302,6 @@ public class BasicDocumentStoreTest exte
try {
UpdateOp up = new UpdateOp(id, false);
- up.set("_id", id);
up.equals("foo", "bar");
super.ds.update(Collection.NODES, Collections.singletonList(id),
up);
fail("conditional update should fail");
@@ -355,7 +329,6 @@ public class BasicDocumentStoreTest exte
if (! super.dsname.contains("Memory")) {
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
assertFalse("create() with ultra-long id needs to fail",
super.ds.create(Collection.NODES, Collections.singletonList(up)));
}
}
@@ -376,7 +349,6 @@ public class BasicDocumentStoreTest exte
// add
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_modified", modTime);
super.ds.create(Collection.JOURNAL, Collections.singletonList(up));
}
@@ -419,7 +391,6 @@ public class BasicDocumentStoreTest exte
} catch (DocumentStoreException ignored) {
}
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
if (success) {
// check that we really can read it
@@ -454,7 +425,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testMaxProperty-" + test;
String pval = generateString(test, true);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("foo", pval);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
if (success) {
@@ -481,7 +451,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() +
".testInterestingPropLengths-" + test;
String pval = generateString(test, true);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("foo", pval);
super.ds.remove(Collection.NODES, id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
@@ -493,7 +462,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() +
".testInterestingPropLengths-" + test;
String pval = generateString(test, false);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("foo", pval);
super.ds.remove(Collection.NODES, id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
@@ -527,17 +495,14 @@ public class BasicDocumentStoreTest exte
}
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
removeMe.add(id);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.set("f0", generateConstantString(3000));
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
up = new UpdateOp(id, false);
- up.set("_id", id);
up.set("f1", generateConstantString(967));
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
@@ -550,7 +515,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testModifiedMaxUpdate";
// create a test node
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_modified", 1000L);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
@@ -558,7 +522,6 @@ public class BasicDocumentStoreTest exte
// update with smaller _modified
UpdateOp up2 = new UpdateOp(id, true);
- up2.set("_id", id);
up2.max("_modified", 100L);
super.ds.findAndUpdate(Collection.NODES, up2);
@@ -577,7 +540,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testModifiedMaxUpdate2";
// create a test node
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_modified", 1000L);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
@@ -586,7 +548,6 @@ public class BasicDocumentStoreTest exte
for (int i = 0; i < 25; i++) {
// update with smaller _modified
UpdateOp up2 = new UpdateOp(id, true);
- up2.set("_id", id);
up2.max("_modified", 100L);
super.ds.findAndUpdate(Collection.NODES, up2);
super.ds.invalidateCache();
@@ -601,7 +562,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testModifyModified";
// create a test node
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_modified", 1000L);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
@@ -609,7 +569,6 @@ public class BasicDocumentStoreTest exte
// update with "max" operation
up = new UpdateOp(id, false);
- up.set("_id", id);
up.max("_modified", 2000L);
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
NodeDocument nd = super.ds.find(Collection.NODES, id, 0);
@@ -617,7 +576,6 @@ public class BasicDocumentStoreTest exte
// update with "set" operation
up = new UpdateOp(id, false);
- up.set("_id", id);
up.set("_modified", 1500L);
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
nd = super.ds.find(Collection.NODES, id, 0);
@@ -630,7 +588,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testModifyDeletedOnce";
// create a test node
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set(NodeDocument.DELETED_ONCE, Boolean.FALSE);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
@@ -645,7 +602,6 @@ public class BasicDocumentStoreTest exte
// update
up = new UpdateOp(id, false);
- up.set("_id", id);
up.set(NodeDocument.DELETED_ONCE, Boolean.TRUE);
super.ds.update(Collection.NODES, Collections.singletonList(id), up);
nd = super.ds.find(Collection.NODES, id, 0);
@@ -670,7 +626,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() + ".testInterestingStrings-"
+ testname;
super.ds.remove(Collection.NODES, id);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("foo", test);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("failed to insert a document with property value of " +
test + " (" + testname + ") in " + super.dsname, success);
@@ -697,7 +652,6 @@ public class BasicDocumentStoreTest exte
// create one of the test nodes
int pre = cnt / 2;
UpdateOp up = new UpdateOp(bid + pre, true);
- up.set("_id", bid + pre);
up.set("foo", "bar");
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
@@ -707,7 +661,6 @@ public class BasicDocumentStoreTest exte
List<UpdateOp> ups = new ArrayList<UpdateOp>();
for (int i = 0; i < cnt; i++) {
UpdateOp op = new UpdateOp(bid + i, true);
- op.set("_id", bid + i);
op.set("foo", "qux");
ups.add(op);
if (i != pre) {
@@ -755,7 +708,6 @@ public class BasicDocumentStoreTest exte
String id = this.getClass().getName() +
".testDeleteNonExistingMultiple-" + UUID.randomUUID();
// create a test node
UpdateOp up = new UpdateOp(id + "-2", true);
- up.set("_id", id + "-2");
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
List<String> todelete = new ArrayList<String>();
@@ -773,7 +725,6 @@ public class BasicDocumentStoreTest exte
// create a test node
super.ds.remove(Collection.NODES, id);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue(success);
removeMe.add(id);
@@ -801,7 +752,6 @@ public class BasicDocumentStoreTest exte
// create a test node
super.ds.remove(Collection.SETTINGS, id);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
boolean success = super.ds.create(Collection.SETTINGS,
Collections.singletonList(up));
assertTrue(success);
removeMeSettings.add(id);
@@ -811,7 +761,6 @@ public class BasicDocumentStoreTest exte
assertNull("_modified should be null until set", m);
up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_modified", 123L);
super.ds.findAndUpdate(Collection.SETTINGS, up);
@@ -821,7 +770,6 @@ public class BasicDocumentStoreTest exte
assertEquals("123", m.toString());
up = new UpdateOp(id, true);
- up.set("_id", id);
up.max("_modified", 122L);
super.ds.findAndUpdate(Collection.SETTINGS, up);
@@ -831,7 +779,6 @@ public class BasicDocumentStoreTest exte
assertEquals("123", m.toString());
up = new UpdateOp(id, true);
- up.set("_id", id);
up.max("_modified", 124L);
super.ds.findAndUpdate(Collection.SETTINGS, up);
@@ -849,7 +796,6 @@ public class BasicDocumentStoreTest exte
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
removeMe.add(id);
@@ -873,7 +819,6 @@ public class BasicDocumentStoreTest exte
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set(NodeDocument.HAS_BINARY_FLAG, i % 2L);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
@@ -894,7 +839,6 @@ public class BasicDocumentStoreTest exte
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set(NodeDocument.DELETED_ONCE, Boolean.valueOf(i % 2 == 0));
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
@@ -919,12 +863,10 @@ public class BasicDocumentStoreTest exte
for (char c :
"!\"#$%&'()*+,-./0123456789:;<=>?@AZ[\\]^_`az{|}~".toCharArray()) {
String id = base + c;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
creates.add(up);
removeMe.add(id);
id = base + "/" + c;
up = new UpdateOp(id, true);
- up.set("_id", id);
creates.add(up);
expected.add(id);
removeMe.add(id);
@@ -985,7 +927,6 @@ public class BasicDocumentStoreTest exte
// add
Revision revision = Revision.fromString("r0-0-1");
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.setMapEntry("_collisions", revision, "foo");
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(up)));
removeMe.add(id);
@@ -1001,7 +942,6 @@ public class BasicDocumentStoreTest exte
// update
Revision revision2 = Revision.fromString("r0-0-2");
UpdateOp up2 = new UpdateOp(id, false);
- up2.set("_id", id);
up2.setMapEntry("_collisions", revision2, "foobar");
NodeDocument old = super.ds.findAndUpdate(Collection.NODES, up2);
assertNotNull(old);
@@ -1014,7 +954,6 @@ public class BasicDocumentStoreTest exte
// update
UpdateOp up3 = new UpdateOp(id, false);
- up3.set("_id", id);
up3.set("foo", "bar");
old = super.ds.findAndUpdate(Collection.NODES, up3);
assertNotNull(old);
@@ -1036,7 +975,6 @@ public class BasicDocumentStoreTest exte
@Test
public void testServerTimeDiff() throws Exception {
UpdateOp up = new UpdateOp("0:/", true);
- up.set("_id", "0:/");
super.ds.create(Collection.NODES, Collections.singletonList(up));
removeMe.add("0:/");
long td = super.ds.determineServerTimeDifferenceMillis();
@@ -1104,7 +1042,6 @@ public class BasicDocumentStoreTest exte
String id = Utils.getIdFromPath(path);
UpdateOp op = new UpdateOp(id, true);
op.set(NodeDocument.MODIFIED_IN_SECS, modified);
- op.set(Document.ID, id);
return op;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Wed Nov 16 15:15:49 2016
@@ -57,7 +57,6 @@ public class BulkCreateOrUpdateClusterTe
for (int i = 0; i < amount; i += 2) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
}
@@ -72,7 +71,6 @@ public class BulkCreateOrUpdateClusterTe
for (int j = 0; j < amountPerThread; j++) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + (j + i * amountPerThread);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 200 + i + j);
threadUpdates.add(up);
removeMe.add(id);
@@ -142,7 +140,6 @@ public class BulkCreateOrUpdateClusterTe
for (int i = 0; i < amount; i += 2) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
removeMe.add(id);
@@ -157,7 +154,6 @@ public class BulkCreateOrUpdateClusterTe
for (int j = 0; j < amount; j++) {
String id = this.getClass().getName() +
".testConcurrentWithConflict" + j;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 200 + i * amount + j);
threadUpdates.add(up);
removeMe.add(id);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
Wed Nov 16 15:15:49 2016
@@ -75,7 +75,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i++) {
String id = this.getClass().getName() + ".testCreateMultiple" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
updates.add(up);
removeMe.add(id);
}
@@ -100,7 +99,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i++) {
String id = this.getClass().getName() + ".testUpdateMultiple" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
removeMe.add(id);
@@ -141,7 +139,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i += 2) {
String id = this.getClass().getName() +
".testCreateOrUpdateMultiple" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
removeMe.add(id);
@@ -153,7 +150,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i++) {
String id = this.getClass().getName() +
".testCreateOrUpdateMultiple" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 200);
updates.add(up);
removeMe.add(id);
@@ -191,7 +187,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i += 2) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
}
@@ -204,7 +199,6 @@ public class BulkCreateOrUpdateTest exte
for (int j = 0; j < amountPerThread; j++) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + (j + i * amountPerThread);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 200 + i + j);
threadUpdates.add(up);
removeMe.add(id);
@@ -262,7 +256,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i += 2) {
String id = this.getClass().getName() +
".testConcurrentNoConflict" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 100);
updates.add(up);
removeMe.add(id);
@@ -276,7 +269,6 @@ public class BulkCreateOrUpdateTest exte
for (int j = 0; j < amount; j++) {
String id = this.getClass().getName() +
".testConcurrentWithConflict" + j;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("prop", 200 + i * amount + j);
threadUpdates.add(up);
removeMe.add(id);
@@ -330,7 +322,6 @@ public class BulkCreateOrUpdateTest exte
for (int i = 0; i < amount; i++) {
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("update_id", i);
up.set("prop_" + i, 100);
updates.add(up);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
Wed Nov 16 15:15:49 2016
@@ -61,15 +61,12 @@ public abstract class CacheConsistencyTe
public void testExceptionInvalidatesCache() {
String id1 = this.getClass().getName() +
".testExceptionInvalidatesCache1";
UpdateOp up1 = new UpdateOp(id1, true);
- up1.set("_id", id1);
up1.set("_test", "oldvalue");
String id2 = this.getClass().getName() +
".testExceptionInvalidatesCache2";
UpdateOp up2 = new UpdateOp(id2, true);
- up2.set("_id", id2);
up2.set("_test", "oldvalue");
String id3 = this.getClass().getName() +
".testExceptionInvalidatesCache3";
UpdateOp up3 = new UpdateOp(id3, true);
- up3.set("_id", id3);
up3.set("_test", "oldvalue");
ds.create(Collection.NODES, Lists.newArrayList(up1, up2, up3));
removeMe.add(id1);
@@ -92,7 +89,6 @@ public abstract class CacheConsistencyTe
setTemporaryUpdateException(random);
try {
up1 = new UpdateOp(id1, false);
- up1.set("_id", id1);
up1.set("_test", random);
ds.findAndUpdate(Collection.NODES, up1);
fail("should have failed with DocumentStoreException");
@@ -116,7 +112,6 @@ public abstract class CacheConsistencyTe
setTemporaryUpdateException(random);
try {
up1 = new UpdateOp(id1, false);
- up1.set("_id", id1);
up1.set("_test", random);
ds.update(Collection.NODES, Collections.singletonList(id1),
up1);
fail("should have failed with DocumentStoreException");
@@ -140,7 +135,6 @@ public abstract class CacheConsistencyTe
setTemporaryUpdateException(random);
try {
up1 = new UpdateOp(id1, false);
- up1.set("_id", id1);
up1.set("_test", random);
ds.createOrUpdate(Collection.NODES, up1);
fail("should have failed with DocumentStoreException");
@@ -169,13 +163,10 @@ public abstract class CacheConsistencyTe
setTemporaryUpdateException(random);
try {
up1 = new UpdateOp(id1, false);
- up1.set("_id", id1);
up1.set("_test", random);
up2 = new UpdateOp(id2, false);
- up2.set("_id", id2);
up2.set("_test", random);
up3 = new UpdateOp(id3, false);
- up3.set("_id", id3);
up3.set("_test", random);
ds.createOrUpdate(Collection.NODES, Lists.newArrayList(up1,
up2, up3));
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
Wed Nov 16 15:15:49 2016
@@ -168,7 +168,6 @@ public class ClusterInfoTest {
long waitFor = 2000;
// modify record to indicate "active" with a lease end in the future
UpdateOp up = new UpdateOp("" + cid, false);
- up.set(Document.ID, "" + cid);
up.set(ClusterNodeInfo.STATE, ClusterNodeState.ACTIVE.toString());
long now = clock.getTime();
up.set(ClusterNodeInfo.LEASE_END_KEY, now + waitFor);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentDocumentStoreTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentDocumentStoreTest.java
Wed Nov 16 15:15:49 2016
@@ -42,7 +42,6 @@ public class ConcurrentDocumentStoreTest
// RDBDocumentStore
String id = this.getClass().getName() + ".testConcurrentUpdate";
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("thread", Thread.currentThread().getName());
up.set("counter", 0L);
ds.create(Collection.NODES, Collections.singletonList(up));
@@ -108,7 +107,6 @@ public class ConcurrentDocumentStoreTest
public void run() {
try {
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("thread", Thread.currentThread().getName());
up.increment("counter", 1L);
if (create) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndInvalidateIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndInvalidateIT.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndInvalidateIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndInvalidateIT.java
Wed Nov 16 15:15:49 2016
@@ -80,7 +80,6 @@ public class ConcurrentQueryAndInvalidat
String id = Utils.getIdFromPath("/node-" + i);
ids.add(id);
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
NodeDocument.setLastRev(op, r);
ops.add(op);
removeMe.add(id);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndUpdateIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndUpdateIT.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndUpdateIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentQueryAndUpdateIT.java
Wed Nov 16 15:15:49 2016
@@ -49,7 +49,6 @@ public class ConcurrentQueryAndUpdateIT
String id = Utils.getIdFromPath("/node-" + i);
ids.add(id);
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
NodeDocument.setLastRev(op, r);
ops.add(op);
removeMe.add(id);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
Wed Nov 16 15:15:49 2016
@@ -84,7 +84,6 @@ public class DocumentStorePerformanceTes
for (int i = 0; i < amount; i++) {
String id = this.getClass().getName() + ".testCreatePerf-" +
size + "-" + cnt + "-" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("foo", pval);
ups.add(up);
ids.add(id);
@@ -120,14 +119,12 @@ public class DocumentStorePerformanceTes
List<UpdateOp> ups = new ArrayList<UpdateOp>();
UpdateOp container = new UpdateOp(cid, true);
- container.set("_id", cid);
ups.add(container);
removeMe.add(cid);
for (int i = 0; i < nodecount; i++) {
String id = String.format("%s/%08d", cid, i);
removeMe.add(id);
UpdateOp u = new UpdateOp(id, true);
- u.set("_id", id);
ups.add(u);
}
@@ -189,7 +186,6 @@ public class DocumentStorePerformanceTes
super.ds.remove(Collection.NODES, id);
removeMe.add(id);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("testprop", generateString(100 * i, true));
up.setMapEntry("_lastRev", cr, "setup");
up.set("_modified",
NodeDocument.getModifiedInSecs(System.currentTimeMillis()));
@@ -237,7 +233,6 @@ public class DocumentStorePerformanceTes
super.ds.remove(Collection.NODES, Collections.singletonList(id));
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
for (int i = 0; i < 100; i++) {
up.set("foo" + i, generateString(1024, true));
}
@@ -285,7 +280,6 @@ public class DocumentStorePerformanceTes
while (System.currentTimeMillis() < end) {
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
if (growing) {
Revision r = new Revision(System.currentTimeMillis(), (int)
cnt, 1);
up.setMapEntry("foo", r, pval);
@@ -333,7 +327,6 @@ public class DocumentStorePerformanceTes
ds1.remove(Collection.NODES, id);
UpdateOp up = new UpdateOp(id, true);
- up.set(Document.ID, id);
up.set(Document.MOD_COUNT, 1L);
up.set("c", 0L);
up.set("u", 0L);
@@ -380,7 +373,6 @@ public class DocumentStorePerformanceTes
int failures = 0;
// operation that does not require fetching the previous state
UpdateOp up = new UpdateOp(id, false);
- up.set(Document.ID, id);
up.increment("u", 1);
while (!threadOneIsDone.get()) {
try {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsIT.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsIT.java
Wed Nov 16 15:15:49 2016
@@ -62,7 +62,6 @@ public class DocumentStoreStatsIT extend
String id = testName.getMethodName();
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
ds.create(Collection.NODES, singletonList(up));
removeMe.add(id);
@@ -74,7 +73,6 @@ public class DocumentStoreStatsIT extend
String id = testName.getMethodName();
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
ds.create(Collection.NODES, singletonList(up));
removeMe.add(id);
@@ -93,7 +91,6 @@ public class DocumentStoreStatsIT extend
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
removeMe.add(id);
@@ -113,7 +110,6 @@ public class DocumentStoreStatsIT extend
String id = testName.getMethodName();
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
ds.create(Collection.NODES, singletonList(up));
removeMe.add(id);
@@ -133,7 +129,6 @@ public class DocumentStoreStatsIT extend
String id = testName.getMethodName();
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
ds.create(Collection.NODES, singletonList(up));
removeMe.add(id);
@@ -142,7 +137,6 @@ public class DocumentStoreStatsIT extend
up = new UpdateOp(id, true);
- up.set("_id", id);
up.max("_modified", 122L);
ds.findAndUpdate(Collection.NODES, up);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java
Wed Nov 16 15:15:49 2016
@@ -299,6 +299,9 @@ public class LastRevRecoveryTest {
private static UpdateOp updateOpFromDocument(Document doc) {
UpdateOp op = new UpdateOp(doc.getId(), true);
for (String key : doc.keySet()) {
+ if (key.equals(Document.ID)) {
+ continue;
+ }
Object obj = doc.get(key);
if (obj instanceof Map) {
@SuppressWarnings("unchecked")
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
Wed Nov 16 15:15:49 2016
@@ -169,7 +169,6 @@ public class MongoDocumentStoreIT extend
DocumentStore store = mk.getDocumentStore();
String id = Utils.getIdFromPath("/test");
UpdateOp updateOp = new UpdateOp(id, true);
- updateOp.set(Document.ID, id);
Revision r1 = Revision.newRevision(1);
updateOp.setMapEntry("p", r1, "a");
Revision r2 = Revision.newRevision(1);
@@ -191,7 +190,6 @@ public class MongoDocumentStoreIT extend
DocumentStore store = mk.getDocumentStore();
String id = Utils.getIdFromPath("/test");
UpdateOp updateOp = new UpdateOp(id, true);
- updateOp.set(Document.ID, id);
Revision r1 = Revision.newRevision(1);
updateOp.setMapEntry("p", r1, "a");
Revision r2 = Revision.newRevision(1);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
Wed Nov 16 15:15:49 2016
@@ -118,7 +118,6 @@ public class MongoDocumentStoreTest {
for (int i = 0; i < nUpdates; i++) {
String path = "/node" + i;
UpdateOp updateOp = new UpdateOp(path, true);
- updateOp.set(Document.ID, "/node" + i);
updateOp.setMapEntry("property1", r1, "value1");
updateOp.increment("property2", 1);
updateOp.set("property3", "value3");
@@ -146,7 +145,6 @@ public class MongoDocumentStoreTest {
for (int i = 0; i < nUpdates; i++) {
String path = "/node" + i;
UpdateOp updateOp = new UpdateOp(path, true);
- updateOp.set(Document.ID, "/node" + i);
updateOp.setMapEntry("property1", r1, "value1");
updateOp.increment("property2", 1);
updateOp.set("property3", "value3");
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Wed Nov 16 15:15:49 2016
@@ -58,7 +58,6 @@ public class MultiDocumentStoreTest exte
}
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_foo", 0);
assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
removeMe.add(id);
@@ -67,7 +66,6 @@ public class MultiDocumentStoreTest exte
for (int i = 0; i < increments; i++) {
up = new UpdateOp(id, true);
- up.set("_id", id);
up.increment("_foo", 1);
if (i % 2 == 0) {
super.ds1.update(Collection.NODES,
Collections.singletonList(id), up);
@@ -95,7 +93,6 @@ public class MultiDocumentStoreTest exte
}
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_foo", "bar");
assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
removeMe.add(id);
@@ -112,7 +109,6 @@ public class MultiDocumentStoreTest exte
// update through ds1
UpdateOp upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
upds1.set("foo", "qux");
super.ds1.update(Collection.NODES, Collections.singletonList(id),
upds1);
nd1 = super.ds1.find(Collection.NODES, id);
@@ -132,7 +128,6 @@ public class MultiDocumentStoreTest exte
// update through ds2
UpdateOp upds2 = new UpdateOp(id, true);
- upds2.set("_id", id);
upds2.set("foo", "blub");
super.ds2.update(Collection.NODES, Collections.singletonList(id),
upds1);
nd2 = super.ds2.find(Collection.NODES, id);
@@ -172,7 +167,6 @@ public class MultiDocumentStoreTest exte
for (int i = 0; i < halfAmount; i++) {
String id = baseId + "-" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set(Document.ID, id);
up.set("_createdby", "ds1");
ops.add(up);
}
@@ -189,7 +183,6 @@ public class MultiDocumentStoreTest exte
for (int i = 0; i < amount; i++) {
String id = baseId + "-" + i;
UpdateOp up = new UpdateOp(id, true);
- up.set(Document.ID, id);
up.set("_createdby", "ds2");
ops.add(up);
}
@@ -234,7 +227,6 @@ public class MultiDocumentStoreTest exte
List<UpdateOp> ops = Lists.newArrayList();
for (String id : ids) {
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
op.set("_t1", "value");
ops.add(op);
}
@@ -259,7 +251,6 @@ public class MultiDocumentStoreTest exte
List<UpdateOp> ops = Lists.newArrayList();
for (String id : ids) {
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
op.set("_t2", "value");
ops.add(op);
}
@@ -304,7 +295,6 @@ public class MultiDocumentStoreTest exte
removeMe.add(id);
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
op.set("_ds1", 1);
assertNull(ds1.createOrUpdate(Collection.NODES, op));
@@ -326,7 +316,6 @@ public class MultiDocumentStoreTest exte
// update call is triggered
String docId = Utils.getIdFromPath("/node-" + i);
UpdateOp update = new UpdateOp(docId, true);
- update.set(Document.ID, docId);
update.set("_ds2", 1);
removeMe.add(docId);
ops.add(update);
@@ -349,7 +338,6 @@ public class MultiDocumentStoreTest exte
super.ds1.remove(Collection.NODES, id);
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_foo", 0);
up.set("_bar", 0);
assertTrue(super.ds1.create(Collection.NODES,
Collections.singletonList(up)));
@@ -361,7 +349,6 @@ public class MultiDocumentStoreTest exte
long origMc = orig.getModCount();
UpdateOp up2 = new UpdateOp(id, false);
- up2.set("_id", id);
up2.increment("_foo", 1L);
super.ds2.update(Collection.NODES, Collections.singletonList(id),
up2);
NodeDocument ds2doc = super.ds2.find(Collection.NODES, id);
@@ -369,7 +356,6 @@ public class MultiDocumentStoreTest exte
assertTrue("_modCount needs to be > " + origMc + " but was " +
ds2Mc, ds2Mc > origMc);
UpdateOp up1 = new UpdateOp(id, false);
- up1.set("_id", id);
up1.increment("_bar", 1L);
super.ds1.update(Collection.NODES, Collections.singletonList(id),
up1);
@@ -386,7 +372,6 @@ public class MultiDocumentStoreTest exte
ds2.invalidateCache();
removeMe.add(id);
UpdateOp op = new UpdateOp(id, true);
- op.set(Document.ID, id);
ds1.create(Collection.NODES, Collections.singletonList(op));
List<Exception> exceptions = Collections.synchronizedList(new
ArrayList<Exception>());
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ResurrectNodeAfterRevisionGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ResurrectNodeAfterRevisionGCTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ResurrectNodeAfterRevisionGCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ResurrectNodeAfterRevisionGCTest.java
Wed Nov 16 15:15:49 2016
@@ -199,7 +199,6 @@ public class ResurrectNodeAfterRevisionG
private void resurrectInvalidateWithModified(Invalidate inv)
throws Exception {
UpdateOp op = new UpdateOp(getIdFromPath("/foo"), true);
- op.set(Document.ID, op.getId());
op.set("p", 0);
op.set(NodeDocument.MODIFIED_IN_SECS, 50);
assertTrue(ds1.create(Collection.NODES, Lists.newArrayList(op)));
@@ -223,7 +222,6 @@ public class ResurrectNodeAfterRevisionG
private void resurrectInvalidate(Invalidate inv) throws Exception {
UpdateOp op = new UpdateOp(getIdFromPath("/foo"), true);
- op.set(Document.ID, op.getId());
op.set("p", 0);
assertTrue(ds1.create(Collection.NODES, Lists.newArrayList(op)));
NodeDocument doc = ds2.find(Collection.NODES, op.getId());
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ValueMapTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ValueMapTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ValueMapTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ValueMapTest.java
Wed Nov 16 15:15:49 2016
@@ -51,14 +51,12 @@ public class ValueMapTest {
MemoryDocumentStore store = new MemoryDocumentStore();
// create previous docs
UpdateOp op = new UpdateOp(Utils.getPreviousIdFor(rootPath, r0, 0),
true);
- op.set(ID, op.getId());
op.setMapEntry("prop", r0, "0");
NodeDocument.setRevision(op, r0, "c");
store.createOrUpdate(NODES, op);
Revision r1low = new Revision(1, 0, 1);
Revision r1high = new Revision(1, 10, 1);
op = new UpdateOp(Utils.getPreviousIdFor(rootPath, r1high, 0), true);
- op.set(ID, op.getId());
for (int i = r1low.getCounter(); i <= r1high.getCounter(); i++) {
Revision r = new Revision(1, i, 1);
op.setMapEntry("foo", r, String.valueOf(i));
@@ -67,7 +65,6 @@ public class ValueMapTest {
store.createOrUpdate(NODES, op);
// create root doc
op = new UpdateOp(rootId, true);
- op.set(ID, op.getId());
Revision r2 = new Revision(2, 0, 1);
op.setMapEntry("prop", r2, "1");
NodeDocument.setRevision(op, r2, "c");
@@ -101,7 +98,6 @@ public class ValueMapTest {
Revision r51 = new Revision(5, 0, 1);
// create previous docs
UpdateOp op = new UpdateOp(Utils.getPreviousIdFor(rootPath, r31, 0),
true);
- op.set(ID, op.getId());
op.setMapEntry("p0", r01, "0");
NodeDocument.setRevision(op, r01, "c");
op.setMapEntry("p1", r31, "1");
@@ -109,7 +105,6 @@ public class ValueMapTest {
store.createOrUpdate(NODES, op);
op = new UpdateOp(Utils.getPreviousIdFor(rootPath, r42, 0), true);
- op.set(ID, op.getId());
op.setMapEntry("p1", r12, "0");
NodeDocument.setRevision(op, r12, "c");
op.setMapEntry("p1", r22, "1");
@@ -120,7 +115,6 @@ public class ValueMapTest {
// create root doc
op = new UpdateOp(rootId, true);
- op.set(ID, op.getId());
op.setMapEntry("p0", r51, "2");
op.setMapEntry("p1", r51, "2");
NodeDocument.setRevision(op, r51, "c");
@@ -196,20 +190,17 @@ public class ValueMapTest {
String prevId1 = Utils.getPreviousIdFor("/", range1.high, 0);
UpdateOp prevOp1 = new UpdateOp(prevId1, true);
- prevOp1.set(Document.ID, prevId1);
NodeDocument.setRevision(prevOp1, r5, "c");
NodeDocument.setRevision(prevOp1, r7, "c");
String prevId2 = Utils.getPreviousIdFor("/", range2.high, 0);
UpdateOp prevOp2 = new UpdateOp(prevId2, true);
- prevOp2.set(Document.ID, prevId2);
NodeDocument.setRevision(prevOp2, r1, "c");
NodeDocument.setRevision(prevOp2, r2, "c");
NodeDocument.setRevision(prevOp2, r4, "c");
String rootId = Utils.getIdFromPath("/");
UpdateOp op = new UpdateOp(rootId, true);
- op.set(Document.ID, rootId);
NodeDocument.setRevision(op, r3, "c");
NodeDocument.setRevision(op, r6, "c");
NodeDocument.setPrevious(op, range1);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
Wed Nov 16 15:15:49 2016
@@ -522,7 +522,6 @@ public class VersionGarbageCollectorIT {
// add a document with a malformed id
String id = "42";
UpdateOp op = new UpdateOp(id, true);
- op.set(ID, id);
NodeDocument.setDeletedOnce(op);
NodeDocument.setModified(op, store.newRevision());
store.getDocumentStore().create(NODES, Lists.newArrayList(op));
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
Wed Nov 16 15:15:49 2016
@@ -74,7 +74,6 @@ public class RDBDocumentStoreJDBCTest ex
String id = this.getClass().getName() + ".conditionalRead";
super.ds.remove(Collection.NODES, id);
UpdateOp op = new UpdateOp(id, true);
- op.set("_id", id);
op.set("_modified", 1L);
removeMe.add(id);
assertTrue(super.ds.create(Collection.NODES,
Collections.singletonList(op)));
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
Wed Nov 16 15:15:49 2016
@@ -48,7 +48,6 @@ public class RDBDocumentStoreTest extend
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set(NodeDocument.DELETED_ONCE, i % 2 == 1);
up.set(NodeDocument.MODIFIED_IN_SECS, now++);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
@@ -77,7 +76,6 @@ public class RDBDocumentStoreTest extend
// every second is a "regular" path
String id = "1:" + (i % 2 == 1 ? "p" : "") + "/" + base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
up.set("_test", base);
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapperTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapperTest.java?rev=1769997&r1=1769996&r2=1769997&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapperTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapperTest.java
Wed Nov 16 15:15:49 2016
@@ -31,7 +31,6 @@ public class TimingDocumentStoreWrapperT
public void createOrUpdate() {
DocumentStore store = new TimingDocumentStoreWrapper(new
MemoryDocumentStore());
UpdateOp op = new UpdateOp("foo", true);
- op.set(Document.ID, "foo");
store.createOrUpdate(Collection.NODES, Collections.singletonList(op));
}
}
