You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2014/12/11 21:44:38 UTC
svn commit: r1644758 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: mreutegg
Date: Thu Dec 11 20:44:38 2014
New Revision: 1644758
URL: http://svn.apache.org/r1644758
Log:
OAK-1782: DiffCache not populated after cache miss
Merged revision 1644750 from trunk
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 20:44:38 2014
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611
021,1611041,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1
630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,164376
7,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611
021,1611041,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1
630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,164376
7,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654,1644750
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java Thu Dec 11 20:44:38 2014
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
/**
* A cache for child node diffs.
@@ -38,12 +39,14 @@ public interface DiffCache {
* @param from the from revision.
* @param to the to revision.
* @param path the path of the parent node.
- * @return the diff or {@code null} if unknown.
+ * @param loader an optional loader for the cache entry.
+ * @return the diff or {@code null} if unknown and no loader was passed.
*/
@CheckForNull
String getChanges(@Nonnull Revision from,
- @Nonnull Revision to,
- @Nonnull String path);
+ @Nonnull Revision to,
+ @Nonnull String path,
+ @Nullable Loader loader);
/**
* Starts a new cache entry for the diff cache. Actual changes are added
@@ -55,7 +58,7 @@ public interface DiffCache {
*/
@Nonnull
Entry newEntry(@Nonnull Revision from,
- @Nonnull Revision to);
+ @Nonnull Revision to);
public interface Entry {
@@ -66,7 +69,7 @@ public interface DiffCache {
* @param changes the child node changes.
*/
void append(@Nonnull String path,
- @Nonnull String changes);
+ @Nonnull String changes);
/**
* Called when all changes have been appended and the entry is ready
@@ -74,4 +77,9 @@ public interface DiffCache {
*/
void done();
}
+
+ public interface Loader {
+
+ String call();
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Dec 11 20:44:38 2014
@@ -1241,12 +1241,14 @@ public final class DocumentNodeStore
if (node.hasNoChildren() && base.hasNoChildren()) {
return "";
}
- String diff = diffCache.getChanges(base.getLastRevision(),
- node.getLastRevision(), node.getPath());
- if (diff == null) {
- diff = diffImpl(base, node);
- }
- return diff;
+ return diffCache.getChanges(base.getLastRevision(),
+ node.getLastRevision(), node.getPath(),
+ new DiffCache.Loader() {
+ @Override
+ public String call() {
+ return diffImpl(base, node);
+ }
+ });
}
String diff(@Nonnull final String fromRevisionId,
@@ -1260,17 +1262,20 @@ public final class DocumentNodeStore
final DocumentNodeState from = getNode(path, fromRev);
final DocumentNodeState to = getNode(path, toRev);
if (from == null || to == null) {
- // TODO implement correct behavior if the node does't/didn't exist
+ // TODO implement correct behavior if the node doesn't/didn't exist
String msg = String.format("Diff is only supported if the node exists in both cases. " +
"Node [%s], fromRev [%s] -> %s, toRev [%s] -> %s",
path, fromRev, from != null, toRev, to != null);
throw new MicroKernelException(msg);
}
- String compactDiff = diffCache.getChanges(fromRev, toRev, path);
- if (compactDiff == null) {
- // calculate the diff
- compactDiff = diffImpl(from, to);
- }
+ String compactDiff = diffCache.getChanges(fromRev, toRev, path,
+ new DiffCache.Loader() {
+ @Override
+ public String call() {
+ // calculate the diff
+ return diffImpl(from, to);
+ }
+ });
JsopWriter writer = new JsopStream();
diffProperties(from, to, writer);
JsopTokenizer t = new JsopTokenizer(compactDiff);
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java Thu Dec 11 20:44:38 2014
@@ -16,8 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
@@ -50,9 +54,25 @@ class MemoryDiffCache implements DiffCac
@Override
public String getChanges(@Nonnull Revision from,
@Nonnull Revision to,
- @Nonnull String path) {
+ @Nonnull String path,
+ final @Nullable Loader loader) {
PathRev key = diffCacheKey(path, from, to);
- StringValue diff = diffCache.getIfPresent(key);
+ StringValue diff;
+ if (loader == null) {
+ diff = diffCache.getIfPresent(key);
+ } else {
+ try {
+ diff = diffCache.get(key, new Callable<StringValue>() {
+ @Override
+ public StringValue call() throws Exception {
+ return new StringValue(loader.call());
+ }
+ });
+ } catch (ExecutionException e) {
+ // try again with loader directly
+ diff = new StringValue(loader.call());
+ }
+ }
return diff != null ? diff.toString() : null;
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoDiffCache.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoDiffCache.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoDiffCache.java Thu Dec 11 20:44:38 2014
@@ -21,6 +21,7 @@ import java.util.concurrent.locks.Lock;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
@@ -77,59 +78,18 @@ public class MongoDiffCache extends Memo
@Override
public String getChanges(@Nonnull Revision from,
@Nonnull Revision to,
- @Nonnull String path) {
+ @Nonnull String path,
+ @Nullable Loader loader) {
Lock lock = locks.get(from);
lock.lock();
try {
- // first try to serve from cache
- String diff = super.getChanges(from, to, path);
- if (diff != null) {
- return diff;
+ String changes = getChangesInternal(from, to, path);
+ if (changes == null && loader != null) {
+ changes = loader.call();
+ // put into memory cache
+ super.newEntry(from, to).append(path, changes);
}
- if (from.getClusterId() != to.getClusterId()) {
- return null;
- }
- // check blacklist
- if (blacklist.getIfPresent(from + "/" + to) != null) {
- return null;
- }
- Revision id = to;
- Diff d = null;
- int numCommits = 0;
- for (;;) {
- // grab from mongo
- DBObject obj = changes.findOne(new BasicDBObject("_id", id.toString()));
- if (obj == null) {
- return null;
- }
- numCommits++;
- if (numCommits > 32) {
- // do not merge more than 32 commits
- blacklist.put(from + "/" + to, "");
- return null;
- }
- if (d == null) {
- d = new Diff(obj);
- } else {
- d.mergeBeforeDiff(new Diff(obj));
- }
-
- // the from revision of the current diff
- id = Revision.fromString((String) obj.get("_b"));
- if (from.equals(id)) {
- // diff is complete
- LOG.debug("Built diff from {} commits", numCommits);
- // apply to diff cache and serve later requests from cache
- d.applyToEntry(super.newEntry(from, to)).done();
- // return changes
- return d.getChanges(path);
- }
-
- if (StableRevisionComparator.INSTANCE.compare(id, from) < 0) {
- break;
- }
- }
- return null;
+ return changes;
} finally {
lock.unlock();
}
@@ -161,6 +121,60 @@ public class MongoDiffCache extends Memo
};
}
+ private String getChangesInternal(@Nonnull Revision from,
+ @Nonnull Revision to,
+ @Nonnull String path) {
+ // first try to serve from cache
+ String diff = super.getChanges(from, to, path, null);
+ if (diff != null) {
+ return diff;
+ }
+ if (from.getClusterId() != to.getClusterId()) {
+ return null;
+ }
+ // check blacklist
+ if (blacklist.getIfPresent(from + "/" + to) != null) {
+ return null;
+ }
+ Revision id = to;
+ Diff d = null;
+ int numCommits = 0;
+ for (;;) {
+ // grab from mongo
+ DBObject obj = changes.findOne(new BasicDBObject("_id", id.toString()));
+ if (obj == null) {
+ return null;
+ }
+ numCommits++;
+ if (numCommits > 32) {
+ // do not merge more than 32 commits
+ blacklist.put(from + "/" + to, "");
+ return null;
+ }
+ if (d == null) {
+ d = new Diff(obj);
+ } else {
+ d.mergeBeforeDiff(new Diff(obj));
+ }
+
+ // the from revision of the current diff
+ id = Revision.fromString((String) obj.get("_b"));
+ if (from.equals(id)) {
+ // diff is complete
+ LOG.debug("Built diff from {} commits", numCommits);
+ // apply to diff cache and serve later requests from cache
+ d.applyToEntry(super.newEntry(from, to)).done();
+ // return changes
+ return d.getChanges(path);
+ }
+
+ if (StableRevisionComparator.INSTANCE.compare(id, from) < 0) {
+ break;
+ }
+ }
+ return null;
+ }
+
static class Diff {
private final DBObject doc;
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java Thu Dec 11 20:44:38 2014
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
/**
* A diff cache implementation, which immediately forgets the diff.
@@ -32,7 +33,11 @@ class AmnesiaDiffCache implements DiffCa
@Override
public String getChanges(@Nonnull Revision from,
@Nonnull Revision to,
- @Nonnull String path) {
+ @Nonnull String path,
+ @Nullable Loader loader) {
+ if (loader != null) {
+ return loader.call();
+ }
return null;
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1644758&r1=1644757&r2=1644758&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Thu Dec 11 20:44:38 2014
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;
@@ -56,6 +57,7 @@ import org.junit.After;
import org.junit.Test;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -792,6 +794,73 @@ public class DocumentNodeStoreTest {
ns2.dispose();
}
+ // OAK-1782
+ @Test
+ public void diffOnce() throws Exception {
+ final AtomicInteger numQueries = new AtomicInteger();
+ MemoryDocumentStore store = new MemoryDocumentStore() {
+ @Nonnull
+ @Override
+ public <T extends Document> List<T> query(Collection<T> collection,
+ String fromKey,
+ String toKey,
+ String indexedProperty,
+ long startValue,
+ int limit) {
+ numQueries.getAndIncrement();
+ return super.query(collection, fromKey, toKey,
+ indexedProperty, startValue, limit);
+ }
+ };
+ final DocumentNodeStore ns = new DocumentMK.Builder()
+ .setDocumentStore(store).getNodeStore();
+ NodeBuilder builder = ns.getRoot().builder();
+ // make sure we have enough children to trigger diffManyChildren
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ builder.child("node-" + i);
+ }
+ merge(ns, builder);
+
+ final Revision head = ns.getHeadRevision();
+ final Revision to = new Revision(
+ head.getTimestamp() + 1000, 0, head.getClusterId());
+ int numReaders = 10;
+ final CountDownLatch ready = new CountDownLatch(numReaders);
+ final CountDownLatch go = new CountDownLatch(1);
+ List<Thread> readers = Lists.newArrayList();
+ for (int i = 0; i < numReaders; i++) {
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ready.countDown();
+ go.await();
+ ns.diff(head.toString(), to.toString(), "/");
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+ });
+ readers.add(t);
+ t.start();
+ }
+
+ ready.await();
+ numQueries.set(0);
+ go.countDown();
+
+ for (Thread t : readers) {
+ t.join();
+ }
+
+ // must not perform more than two queries
+ // 1) query the first 50 children to find out there are many
+ // 2) query for the changed children between the two revisions
+ assertTrue(numQueries.get() <= 2);
+
+ store.dispose();
+ }
+
private static void merge(NodeStore store, NodeBuilder root)
throws CommitFailedException {
store.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);