Author: reschke
Date: Thu Nov 26 10:44:11 2015
New Revision: 1716600
URL: http://svn.apache.org/viewvc?rev=1716600&view=rev
Log:
OAK-3678: Use stable reverse revision comparator in UpdateUtils.applyChanges()
(ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 10:44:11 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1
711498,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715767,1715771,1715888,1715898,1716178,1716576,1716596
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1
711498,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java
Thu Nov 26 10:44:11 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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
Thu Nov 26 10:44:11 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, store)) {
throw new IllegalStateException("Unable to annotate our revision "
+ "with collision marker. Our revision: " + ourRev
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Thu Nov 26 10:44:11 2015
@@ -531,7 +531,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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
Thu Nov 26 10:44:11 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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
Thu Nov 26 10:44:11 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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
Thu Nov 26 10:44:11 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;
@@ -270,7 +261,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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
Thu Nov 26 10:44:11 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;
@@ -148,12 +147,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;
@@ -837,7 +830,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 {
@@ -884,7 +877,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();
@@ -1094,7 +1087,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());
}
@@ -1224,7 +1217,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);
@@ -1300,7 +1293,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/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Thu Nov 26 10:44:11 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/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Thu Nov 26 10:44:11 2015
@@ -68,7 +68,7 @@ public class NodeDocumentTest {
NodeDocument.setRevision(op, r, "c");
NodeDocument.addCollision(op, r);
}
- UpdateUtils.applyChanges(doc, op, StableRevisionComparator.INSTANCE);
+ UpdateUtils.applyChanges(doc, op);
Revision head = DummyRevisionContext.INSTANCE.getHeadRevision();
doc.split(DummyRevisionContext.INSTANCE, head);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java?rev=1716600&r1=1716599&r2=1716600&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtilsTest.java
Thu Nov 26 10:44:11 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);
