Author: mreutegg
Date: Wed Nov 25 14:28:23 2015
New Revision: 1716426
URL: http://svn.apache.org/viewvc?rev=1716426&view=rev
Log:
OAk-3678: Use stable reverse revision comparator in UpdateUtils.applyChanges()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.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/UpdateUtils.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.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/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
Wed Nov 25 14:28:23 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
@@ -163,12 +162,11 @@ final class BatchCommit {
void populateResults(NodeDocument before) {
DocumentStore store = queue.getStore();
- Comparator<Revision> comparator = queue.getComparator();
for (UpdateOp op : ops) {
results.add(Futures.immediateFuture(before));
NodeDocument after = new NodeDocument(store);
before.deepCopy(after);
- UpdateUtils.applyChanges(after, op, comparator);
+ UpdateUtils.applyChanges(after, op);
before = after;
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
Wed Nov 25 14:28:23 2015
@@ -46,18 +46,15 @@ class Collision {
private final Revision theirRev;
private final UpdateOp ourOp;
private final Revision ourRev;
- private final RevisionContext context;
Collision(@Nonnull NodeDocument document,
@Nonnull Revision theirRev,
@Nonnull UpdateOp ourOp,
- @Nonnull Revision ourRev,
- @Nonnull RevisionContext context) {
+ @Nonnull Revision ourRev) {
this.document = checkNotNull(document);
this.theirRev = checkNotNull(theirRev);
this.ourOp = checkNotNull(ourOp);
this.ourRev = checkNotNull(ourRev);
- this.context = checkNotNull(context);
}
/**
@@ -78,7 +75,7 @@ class Collision {
// their commit wins, we have to mark ourRev
NodeDocument newDoc = Collection.NODES.newDocument(store);
document.deepCopy(newDoc);
- UpdateUtils.applyChanges(newDoc, ourOp,
context.getRevisionComparator());
+ UpdateUtils.applyChanges(newDoc, ourOp);
if (!markCommitRoot(newDoc, ourRev, theirRev, store)) {
throw new IllegalStateException("Unable to annotate our revision "
+ "with collision marker. Our revision: " + ourRev
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Wed Nov 25 14:28:23 2015
@@ -552,7 +552,7 @@ public class Commit {
if (!collisions.isEmpty() && isConflicting(before, op)) {
for (Revision r : collisions) {
// mark collisions on commit root
- Collision c = new Collision(before, r, op, revision,
nodeStore);
+ Collision c = new Collision(before, r, op, revision);
if (c.mark(store).equals(revision)) {
// our revision was marked
if (baseRevision.isBranch()) {
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=1716426&r1=1716425&r2=1716426&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 25 14:28:23 2015
@@ -341,7 +341,7 @@ class SplitOperations {
}
// check size of old document
NodeDocument oldDoc = new NodeDocument(STORE);
- UpdateUtils.applyChanges(oldDoc, old,
context.getRevisionComparator());
+ UpdateUtils.applyChanges(oldDoc, old);
setSplitDocProps(doc, oldDoc, old, high);
// only split if enough of the data can be moved to old document
if (oldDoc.getMemory() > doc.getMemory() * SPLIT_RATIO
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=1716426&r1=1716425&r2=1716426&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 Nov 25 14:28:23 2015
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import java.util.Comparator;
import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry;
@@ -44,12 +43,9 @@ public class UpdateUtils {
* the target document.
* @param update
* the changes to apply.
- * @param comparator
- * the revision comparator.
*/
public static void applyChanges(@Nonnull Document doc,
- @Nonnull UpdateOp update,
- @Nonnull Comparator<Revision> comparator) {
+ @Nonnull UpdateOp update) {
for (Entry<Key, Operation> e :
checkNotNull(update).getChanges().entrySet()) {
Key k = e.getKey();
Operation op = e.getValue();
@@ -81,7 +77,7 @@ public class UpdateUtils {
@SuppressWarnings("unchecked")
Map<Revision, Object> m = (Map<Revision, Object>) old;
if (m == null) {
- m = new TreeMap<Revision, Object>(comparator);
+ m = new TreeMap<Revision,
Object>(StableRevisionComparator.REVERSE);
doc.put(k.getName(), m);
}
if (k.getRevision() == null) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
Wed Nov 25 14:28:23 2015
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.plugins.document.memory;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentNavigableMap;
@@ -37,8 +36,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.JournalEntry;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
-import org.apache.jackrabbit.oak.plugins.document.Revision;
-import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
@@ -83,12 +80,6 @@ public class MemoryDocumentStore impleme
private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
- /**
- * Comparator for maps with {@link Revision} keys. The maps are ordered
- * descending, newest revisions first!
- */
- private final Comparator<Revision> comparator =
StableRevisionComparator.REVERSE;
-
private ReadPreference readPreference;
private WriteConcern writeConcern;
@@ -296,7 +287,7 @@ public class MemoryDocumentStore impleme
return null;
}
// update the document
- UpdateUtils.applyChanges(doc, update, comparator);
+ UpdateUtils.applyChanges(doc, update);
doc.seal();
map.put(update.getId(), doc);
return oldDoc;
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=1716426&r1=1716425&r2=1716426&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 25 14:28:23 2015
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -143,12 +142,6 @@ public class MongoDocumentStore implemen
*/
private final AtomicLong lockAcquisitionCounter = new AtomicLong();
- /**
- * Comparator for maps with {@link Revision} keys. The maps are ordered
- * descending, newest revisions first!
- */
- private final Comparator<Revision> comparator =
StableRevisionComparator.REVERSE;
-
private Clock clock = Clock.SIMPLE;
private final long maxReplicationLagMillis;
@@ -817,7 +810,7 @@ public class MongoDocumentStore implemen
} else if (upsert) {
if (collection == Collection.NODES) {
NodeDocument doc = (NodeDocument)
collection.newDocument(this);
- UpdateUtils.applyChanges(doc, updateOp, comparator);
+ UpdateUtils.applyChanges(doc, updateOp);
addToCache(doc);
}
} else {
@@ -864,7 +857,7 @@ public class MongoDocumentStore implemen
UpdateOp update = updateOps.get(i);
UpdateUtils.assertUnconditional(update);
T target = collection.newDocument(this);
- UpdateUtils.applyChanges(target, update, comparator);
+ UpdateUtils.applyChanges(target, update);
docs.add(target);
for (Entry<Key, Operation> entry : update.getChanges().entrySet())
{
Key k = entry.getKey();
@@ -1068,7 +1061,7 @@ public class MongoDocumentStore implemen
@Nonnull
private Map<Revision, Object> convertMongoMap(@Nonnull BasicDBObject obj) {
- Map<Revision, Object> map = new TreeMap<Revision, Object>(comparator);
+ Map<Revision, Object> map = new TreeMap<Revision,
Object>(StableRevisionComparator.REVERSE);
for (Map.Entry<String, Object> entry : obj.entrySet()) {
map.put(Revision.fromString(entry.getKey()), entry.getValue());
}
@@ -1190,7 +1183,7 @@ public class MongoDocumentStore implemen
NodeDocument newDoc = (NodeDocument)
collection.newDocument(this);
oldDoc.deepCopy(newDoc);
- UpdateUtils.applyChanges(newDoc, updateOp, comparator);
+ UpdateUtils.applyChanges(newDoc, updateOp);
newDoc.seal();
nodesCache.put(key, newDoc);
@@ -1266,7 +1259,7 @@ public class MongoDocumentStore implemen
CacheValue key = new StringValue(oldDoc.getId());
NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
oldDoc.deepCopy(newDoc);
- UpdateUtils.applyChanges(newDoc, updateOp, comparator);
+ UpdateUtils.applyChanges(newDoc, updateOp);
newDoc.seal();
nodesCache.put(key, newDoc);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Wed Nov 25 14:28:23 2015
@@ -36,7 +36,6 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -477,8 +476,6 @@ public class RDBDocumentStore implements
private static final Logger LOG =
LoggerFactory.getLogger(RDBDocumentStore.class);
- private final Comparator<Revision> comparator =
StableRevisionComparator.REVERSE;
-
private Exception callStack;
private RDBConnectionHandler ch;
@@ -894,7 +891,7 @@ public class RDBDocumentStore implements
if (hasChangesToCollisions(update)) {
update.increment(COLLISIONSMODCOUNT, 1);
}
- UpdateUtils.applyChanges(doc, update, comparator);
+ UpdateUtils.applyChanges(doc, update);
if (!update.getId().equals(doc.getId())) {
throw new DocumentStoreException("ID mismatch -
UpdateOp: " + update.getId() + ", ID property: "
+ doc.getId());
@@ -936,7 +933,7 @@ public class RDBDocumentStore implements
if (hasChangesToCollisions(update)) {
update.increment(COLLISIONSMODCOUNT, 1);
}
- UpdateUtils.applyChanges(doc, update, comparator);
+ UpdateUtils.applyChanges(doc, update);
try {
insertDocuments(collection, Collections.singletonList(doc));
addToCache(collection, doc);
@@ -1036,7 +1033,7 @@ public class RDBDocumentStore implements
update.increment(COLLISIONSMODCOUNT, 1);
}
update.increment(MODCOUNT, 1);
- UpdateUtils.applyChanges(doc, update, comparator);
+ UpdateUtils.applyChanges(doc, update);
doc.seal();
return doc;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Wed Nov 25 14:28:23 2015
@@ -69,7 +69,7 @@ public class NodeDocumentTest {
NodeDocument.setRevision(op, r, "c");
NodeDocument.addCollision(op, r, Revision.newRevision(1));
}
- UpdateUtils.applyChanges(doc, op, StableRevisionComparator.INSTANCE);
+ UpdateUtils.applyChanges(doc, op);
Revision head = DummyRevisionContext.INSTANCE.getHeadRevision();
doc.split(DummyRevisionContext.INSTANCE, head);
}
@@ -135,7 +135,7 @@ public class NodeDocumentTest {
// regular collision entries
NodeDocument.addCollision(op, r1, c1);
NodeDocument.addCollision(op, r2, c2);
- UpdateUtils.applyChanges(doc, op, StableRevisionComparator.INSTANCE);
+ UpdateUtils.applyChanges(doc, op);
branchCommits = Collections.singleton(r0);
conflict = doc.getMostRecentConflictFor(branchCommits, context);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java?rev=1716426&r1=1716425&r2=1716426&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
Wed Nov 25 14:28:23 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import java.util.Comparator;
import java.util.Map;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -34,7 +33,6 @@ public class UpdateUtilsTest {
@Test
public void applyChanges() {
- Comparator<Revision> comp = StableRevisionComparator.INSTANCE;
Revision r = Revision.newRevision(1);
String id = Utils.getIdFromPath("/foo");
Document d = new Document();
@@ -43,43 +41,42 @@ public class UpdateUtilsTest {
UpdateOp op = newUpdateOp(id);
op.set("p", 42L);
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertEquals(42L, d.get("p"));
op = newUpdateOp(id);
op.max("p", 23L);
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertEquals(42L, d.get("p"));
op = newUpdateOp(id);
op.max("p", 58L);
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertEquals(58L, d.get("p"));
op = newUpdateOp(id);
op.increment("p", 3);
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertEquals(61L, d.get("p"));
op = newUpdateOp(id);
op.setMapEntry("t", r, "value");
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertEquals("value", getMapEntry(d, "t", r));
op = newUpdateOp(id);
op.removeMapEntry("t", r);
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
assertNull(getMapEntry(d, "t", r));
}
@Test
public void checkConditions() {
- Comparator<Revision> comp = StableRevisionComparator.INSTANCE;
Revision r = Revision.newRevision(1);
String id = Utils.getIdFromPath("/foo");
Document d = new Document();
@@ -88,7 +85,7 @@ public class UpdateUtilsTest {
UpdateOp op = newUpdateOp(id);
op.set("p", 42L);
op.setMapEntry("t", r, "value");
- UpdateUtils.applyChanges(d, op, comp);
+ UpdateUtils.applyChanges(d, op);
op = newUpdateOp(id);
op.containsMapEntry("t", r, true);
