Author: reschke
Date: Thu Jan 21 12:58:33 2016
New Revision: 1725932
URL: http://svn.apache.org/viewvc?rev=1725932&view=rev
Log:
OAK-3841: Change return type of Document.getModCount() to Long (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/CachedNodeDocument.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.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/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 12:58:33 2016
@@ -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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1695
521,1695540,1695571,1695905,1696190,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,1701907,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,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,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,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555
+/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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1695
521,1695540,1695571,1695905,1696190,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,1701907,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,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,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,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachedNodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachedNodeDocument.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachedNodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachedNodeDocument.java
Thu Jan 21 12:58:33 2016
@@ -26,7 +26,7 @@ package org.apache.jackrabbit.oak.plugin
*/
public interface CachedNodeDocument {
- Number getModCount();
+ Long getModCount();
long getCreated();
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
Thu Jan 21 12:58:33 2016
@@ -83,8 +83,8 @@ public class Document implements CacheVa
* none is set.
*/
@CheckForNull
- public Number getModCount() {
- return (Number) get(MOD_COUNT);
+ public Long getModCount() {
+ return Utils.asLong((Number) get(MOD_COUNT));
}
/**
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
Thu Jan 21 12:58:33 2016
@@ -79,11 +79,11 @@ public class NodeDocumentCache implement
* @return number of invalidated entries
*/
@Nonnegative
- public int invalidateOutdated(@Nonnull Map<String, Number> modCounts) {
+ public int invalidateOutdated(@Nonnull Map<String, Long> modCounts) {
int invalidatedCount = 0;
- for (Entry<String, Number> e : modCounts.entrySet()) {
+ for (Entry<String, Long> e : modCounts.entrySet()) {
String id = e.getKey();
- Number modCount = e.getValue();
+ Long modCount = e.getValue();
NodeDocument doc = getIfPresent(id);
if (doc == null) {
continue;
@@ -163,14 +163,14 @@ public class NodeDocumentCache implement
newerDoc = doc;
putInternal(doc);
} else {
- Number cachedModCount = cachedDoc.getModCount();
- Number modCount = doc.getModCount();
+ Long cachedModCount = cachedDoc.getModCount();
+ Long modCount = doc.getModCount();
if (cachedModCount == null || modCount == null) {
throw new IllegalStateException("Missing " +
Document.MOD_COUNT);
}
- if (modCount.longValue() > cachedModCount.longValue()) {
+ if (modCount > cachedModCount) {
newerDoc = doc;
putInternal(doc);
} else {
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=1725932&r1=1725931&r2=1725932&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 Jan 21 12:58:33 2016
@@ -285,7 +285,7 @@ public class MongoDocumentStore implemen
ids.size(), size);
}
- Map<String, Number> modCounts = getModCounts(ids);
+ Map<String, Long> modCounts = getModCounts(ids);
result.queryCount++;
int invalidated = nodesCache.invalidateOutdated(modCounts);
@@ -703,7 +703,7 @@ public class MongoDocumentStore implemen
final long start = PERFLOG.start();
try {
// get modCount of cached document
- Number modCount = null;
+ Long modCount = null;
T cachedDoc = null;
if (collection == Collection.NODES) {
cachedDoc = (T) nodesCache.getIfPresent(updateOp.getId());
@@ -899,17 +899,17 @@ public class MongoDocumentStore implemen
throw new DocumentStoreException("Update failed: " +
writeResult.getError());
}
if (collection == Collection.NODES) {
- Map<String, Number> modCounts =
getModCounts(filterValues(cachedDocs, notNull()).keySet());
+ Map<String, Long> modCounts =
getModCounts(filterValues(cachedDocs, notNull()).keySet());
// update cache
for (Entry<String, NodeDocument> entry :
cachedDocs.entrySet()) {
// the cachedDocs is not empty, so the collection =
NODES
Lock lock = nodeLocks.acquire(entry.getKey());
try {
- Number postUpdateModCount =
modCounts.get(entry.getKey());
+ Long postUpdateModCount =
modCounts.get(entry.getKey());
if (postUpdateModCount != null
&& entry.getValue() != null
&& entry.getValue() != NodeDocument.NULL
- && (postUpdateModCount.longValue() - 1) ==
entry.getValue().getModCount()) {
+ && (postUpdateModCount - 1) ==
entry.getValue().getModCount()) {
// post update modCount is one higher than
// what we currently see in the cache. we can
// replace the cached document
@@ -948,7 +948,7 @@ public class MongoDocumentStore implemen
* @throws MongoException if the call fails
*/
@Nonnull
- private Map<String, Number> getModCounts(Iterable<String> keys)
+ private Map<String, Long> getModCounts(Iterable<String> keys)
throws MongoException {
QueryBuilder query = QueryBuilder.start(Document.ID).in(keys);
// Fetch only the modCount and id
@@ -958,10 +958,10 @@ public class MongoDocumentStore implemen
DBCursor cursor = nodes.find(query.get(), fields);
cursor.setReadPreference(ReadPreference.primary());
- Map<String, Number> modCounts = Maps.newHashMap();
+ Map<String, Long> modCounts = Maps.newHashMap();
for (DBObject obj : cursor) {
String id = (String) obj.get(Document.ID);
- Number modCount = (Number) obj.get(Document.MOD_COUNT);
+ Long modCount = Utils.asLong((Number) obj.get(Document.MOD_COUNT));
modCounts.put(id, modCount);
}
return modCounts;
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=1725932&r1=1725931&r2=1725932&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 Jan 21 12:58:33 2016
@@ -1620,8 +1620,8 @@ public class RDBDocumentStore implements
}
private static long modcountOf(@Nonnull Document doc) {
- Number n = doc.getModCount();
- return n != null ? n.longValue() : -1;
+ Long n = doc.getModCount();
+ return n != null ? n : -1;
}
@Nonnull
@@ -1639,17 +1639,17 @@ public class RDBDocumentStore implements
String id = row.getId();
NodeDocument inCache = nodesCache.getIfPresent(id);
- Number modCount = row.getModcount();
+ Long modCount = row.getModcount();
// do not overwrite document in cache if the
// existing one in the cache is newer
if (inCache != null && inCache != NodeDocument.NULL) {
// check mod count
- Number cachedModCount = inCache.getModCount();
+ Long cachedModCount = inCache.getModCount();
if (cachedModCount == null) {
throw new IllegalStateException("Missing " +
Document.MOD_COUNT);
}
- if (modCount.longValue() <= cachedModCount.longValue()) {
+ if (modCount <= cachedModCount) {
// we can use the cached document
inCache.markUpToDate(now);
return castAsT(inCache);
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Thu Jan 21 12:58:33 2016
@@ -668,4 +668,21 @@ public class Utils {
}
return maxTime;
}
+
+ /**
+ * Returns the given number instance as a {@code Long}.
+ *
+ * @param n a number or {@code null}.
+ * @return the number converted to a {@code Long} or {@code null}
+ * if {@code n} is {@code null}.
+ */
+ public static Long asLong(@Nullable Number n) {
+ if (n == null) {
+ return null;
+ } else if (n instanceof Long) {
+ return (Long) n;
+ } else {
+ return n.longValue();
+ }
+ }
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
Thu Jan 21 12:58:33 2016
@@ -412,7 +412,7 @@ public class DocumentStorePerformanceTes
assertNotNull(nd);
int cc = nd.get("c") == null ? 0 :
Integer.valueOf(nd.get("c").toString());
int uc = nd.get("u") == null ? 0 :
Integer.valueOf(nd.get("u").toString());
- long mc = nd.getModCount().longValue();
+ long mc = nd.getModCount();
String msg = String.format(
"Concurrent updates %s on %s cond. updates: %d (failures: %s),
uncond. updates: %d (failures: %s), _modCount: %d, ops/sec: %d, %% of cond.
updates: %d",
stores == 1 ? "(one ds)" : "(two ds)", super.dsname, cc,
nd.get("cfailures"), uc, nd.get("ufailures"), mc,
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
Thu Jan 21 12:58:33 2016
@@ -149,7 +149,7 @@ public class MongoDocumentStoreIT extend
NodeDocument doc = docStore.find(NODES, Utils.getIdFromPath("/test"));
assertNotNull(doc);
- Number mc1 = doc.getModCount();
+ Long mc1 = doc.getModCount();
assertNotNull(mc1);
try {
mk.commit("/test", "^\"prop\":\"v2\"", head, null);
@@ -159,9 +159,9 @@ public class MongoDocumentStoreIT extend
}
doc = docStore.find(NODES, Utils.getIdFromPath("/test"));
assertNotNull(doc);
- Number mc2 = doc.getModCount();
+ Long mc2 = doc.getModCount();
assertNotNull(mc2);
- assertTrue(mc2.longValue() > mc1.longValue());
+ assertTrue(mc2 > mc1);
}
// OAK-3556
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Thu Jan 21 12:58:33 2016
@@ -101,7 +101,7 @@ public class MultiDocumentStoreTest exte
NodeDocument nd2 = super.ds2.find(Collection.NODES, id);
assertNotNull(nd1);
assertNotNull(nd2);
- long firstVersion = nd1.getModCount().longValue();
+ long firstVersion = nd1.getModCount();
assertEquals(firstVersion, nd2.getModCount().longValue());
// letTimeElapse();
@@ -162,14 +162,14 @@ public class MultiDocumentStoreTest exte
// only run test if DS supports modcount
if (orig.getModCount() != null) {
- long origMc = orig.getModCount().longValue();
+ 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);
- long ds2Mc = ds2doc.getModCount().longValue();
+ long ds2Mc = ds2doc.getModCount();
assertTrue("_modCount needs to be > " + origMc + " but was " +
ds2Mc, ds2Mc > origMc);
UpdateOp up1 = new UpdateOp(id, false);
@@ -178,7 +178,7 @@ public class MultiDocumentStoreTest exte
super.ds1.update(Collection.NODES, Collections.singletonList(id),
up1);
NodeDocument ds1doc = super.ds1.find(Collection.NODES, id);
- long ds1Mc = ds1doc.getModCount().longValue();
+ long ds1Mc = ds1doc.getModCount();
assertTrue("_modCount needs to be > " + ds2Mc + " but was " +
ds1Mc, ds1Mc > ds2Mc);
}
}
@@ -238,7 +238,7 @@ public class MultiDocumentStoreTest exte
try {
DocumentStore ds =
stores.get(random.nextInt(stores.size()));
NodeDocument d = ds.find(Collection.NODES, id);
- long modCount = d.getModCount().longValue();
+ long modCount = d.getModCount();
NodeDocument seen = docs.get(modCount);
if (seen == null) {
docs.put(modCount, d);
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java?rev=1725932&r1=1725931&r2=1725932&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
Thu Jan 21 12:58:33 2016
@@ -61,7 +61,7 @@ public class RDBDocumentSerializerTest {
assertEquals("_foo", doc.getId());
assertEquals(true, doc.hasBinary());
assertEquals(true, doc.get(NodeDocument.DELETED_ONCE));
- assertEquals(2L, doc.getModCount());
+ assertEquals(2L, doc.getModCount().longValue());
}
@Test
@@ -70,7 +70,7 @@ public class RDBDocumentSerializerTest {
NodeDocument doc = this.ser.fromRow(Collection.NODES, row);
assertEquals("_foo", doc.getId());
assertEquals(false, doc.hasBinary());
- assertEquals(2L, doc.getModCount());
+ assertEquals(2L, doc.getModCount().longValue());
}
@Test
@@ -80,7 +80,7 @@ public class RDBDocumentSerializerTest {
NodeDocument doc = this.ser.fromRow(Collection.NODES, row);
assertEquals("_foo", doc.getId());
assertEquals(false, doc.hasBinary());
- assertEquals(2L, doc.getModCount());
+ assertEquals(2L, doc.getModCount().longValue());
assertEquals("string", doc.get("s"));
assertEquals(Boolean.TRUE, doc.get("b"));
assertEquals(1L, doc.get("i"));
