Author: chetanm
Date: Tue Feb 10 06:45:45 2015
New Revision: 1658624
URL: http://svn.apache.org/r1658624
Log:
OAK-1709 - Diff cache entry too large
OAK-2453 - Move MongoDiffCache to mongo package
Merging 1655237, 1655248
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
(with props)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
(with props)
Removed:
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/MongoDiffCacheTest.java
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/DocumentMK.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/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 06:45:45 2015
@@ -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,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610
658,1610664,1611021,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,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,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,1
630055-1630057,1630156,1630299,1630338,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,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,164311
1,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653572,1653579,1653591,1653804,1653809,1653849-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655996,1656027,1656394,1656400,1656425,1656427,1656628
+/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,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610
658,1610664,1611021,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,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,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,1
630055-1630057,1630156,1630299,1630338,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,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,164311
1,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653572,1653579,1653591,1653804,1653809,1653849-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656628
/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=1658624&r1=1658623&r2=1658624&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
Tue Feb 10 06:45:45 2015
@@ -74,8 +74,11 @@ public interface DiffCache {
/**
* Called when all changes have been appended and the entry is ready
* to be used by the cache.
+ *
+ * @return {@code true} if the entry was successfully added to the
+ * cache, {@code false} otherwise.
*/
- void done();
+ boolean done();
}
public interface Loader {
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1658624&r1=1658623&r2=1658624&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Tue Feb 10 06:45:45 2015
@@ -42,6 +42,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState.Children;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDiffCache;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoVersionGCSupport;
import org.apache.jackrabbit.oak.plugins.document.persistentCache.CacheType;
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=1658624&r1=1658623&r2=1658624&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
Tue Feb 10 06:45:45 2015
@@ -33,7 +33,7 @@ import static com.google.common.base.Pre
/**
* An in-memory diff cache implementation.
*/
-class MemoryDiffCache implements DiffCache {
+public class MemoryDiffCache implements DiffCache {
/**
* Diff cache.
@@ -44,7 +44,7 @@ class MemoryDiffCache implements DiffCac
protected final CacheStats diffCacheStats;
- MemoryDiffCache(DocumentMK.Builder builder) {
+ protected MemoryDiffCache(DocumentMK.Builder builder) {
diffCache = builder.buildDiffCache();
diffCacheStats = new CacheStats(diffCache, "Document-Diff",
builder.getWeigher(), builder.getDiffCacheSize());
@@ -104,7 +104,8 @@ class MemoryDiffCache implements DiffCac
}
@Override
- public void done() {
+ public boolean done() {
+ return true;
}
}
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java?rev=1658624&view=auto
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
(added)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
Tue Feb 10 06:45:45 2015
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document.mongo;
+
+import java.util.Set;
+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;
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.json.JsopReader;
+import org.apache.jackrabbit.oak.commons.json.JsopStream;
+import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.commons.json.JsopWriter;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.MemoryDiffCache;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
+import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Striped;
+import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * A diff cache implementation using a capped collection as a secondary cache.
+ */
+public class MongoDiffCache extends MemoryDiffCache {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(MongoDiffCache.class);
+
+ private static final long MB = 1024 * 1024;
+
+ private static final String COLLECTION_NAME = "changes";
+
+ private final DBCollection changes;
+
+ private final Cache<String, String> blacklist =
CacheBuilder.newBuilder().maximumSize(1024).build();
+
+ private final Striped<Lock> locks = Striped.lock(16);
+
+ public MongoDiffCache(DB db, int sizeMB, DocumentMK.Builder builder) {
+ super(builder);
+ if (db.collectionExists(COLLECTION_NAME)) {
+ changes = db.getCollection(COLLECTION_NAME);
+ } else {
+ changes = db.createCollection(COLLECTION_NAME,
+ BasicDBObjectBuilder.start().add("capped", true)
+ .add("size", sizeMB * MB).get());
+ }
+ }
+
+ @CheckForNull
+ @Override
+ public String getChanges(@Nonnull Revision from,
+ @Nonnull Revision to,
+ @Nonnull String path,
+ @Nullable Loader loader) {
+ Lock lock = locks.get(from);
+ lock.lock();
+ try {
+ 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);
+ }
+ return changes;
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Nonnull
+ @Override
+ public Entry newEntry(@Nonnull final Revision from,
+ @Nonnull final Revision to) {
+ return new MemoryEntry(from, to) {
+
+ private Diff commit = new Diff(from, to);
+
+ @Override
+ public void append(@Nonnull String path, @Nonnull String changes) {
+ // super.append() will apply to diff cache in base class
+ super.append(path, changes);
+ commit.append(path, changes);
+ }
+
+ @Override
+ public boolean done() {
+ try {
+ // do not write back if doc is too big
+ if (commit.size < 16 * 1024 * 1024) {
+ changes.insert(commit.doc,
WriteConcern.UNACKNOWLEDGED);
+ return true;
+ }
+ } catch (MongoException e) {
+ LOG.warn("Write back of diff cache entry failed", e);
+ }
+ return false;
+ }
+ };
+ }
+
+ 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;
+ private long size;
+
+ Diff(Revision from, Revision to) {
+ this.doc = new BasicDBObject();
+ this.doc.put("_id", to.toString());
+ this.doc.put("_b", from.toString());
+ }
+
+ Diff(DBObject doc) {
+ this.doc = doc;
+ }
+
+ void append(String path, String changes) {
+ DBObject current = doc;
+ for (String name : PathUtils.elements(path)) {
+ String escName = Utils.escapePropertyName(name);
+ if (current.containsField(escName)) {
+ current = (DBObject) current.get(escName);
+ } else {
+ BasicDBObject child = new BasicDBObject();
+ current.put(escName, child);
+ current = child;
+ size += escName.length() * 2 + 8;
+ }
+ }
+ current.put("_c", checkNotNull(changes));
+ size += 4 + changes.length() * 2 + 8;
+ }
+
+ String getChanges(String path) {
+ DBObject current = doc;
+ for (String name : PathUtils.elements(path)) {
+ String n = Utils.unescapePropertyName(name);
+ current = (DBObject) current.get(n);
+ if (current == null) {
+ break;
+ }
+ }
+ if (current == null || !current.containsField("_c")) {
+ // no changes here
+ return "";
+ } else {
+ return current.get("_c").toString();
+ }
+ }
+
+ Entry applyToEntry(Entry entry) {
+ applyInternal(doc, "/", entry);
+ return entry;
+ }
+
+ void mergeBeforeDiff(Diff before) {
+ mergeInternal(doc, before.doc, Sets.<String>newHashSet(),
+ Sets.<String>newHashSet(), Sets.<String>newHashSet());
+ doc.put("_b", before.doc.get("_b"));
+ }
+
+ private static void mergeInternal(DBObject doc, DBObject before,
+ final Set<String> added,
+ final Set<String> removed,
+ final Set<String> modified) {
+ added.clear();
+ removed.clear();
+ modified.clear();
+ String changes = (String) doc.get("_c");
+ if (changes != null) {
+ parse(changes, new ParserCallback() {
+ @Override
+ public void added(String name) {
+ added.add(name);
+ }
+
+ @Override
+ public void removed(String name) {
+ removed.add(name);
+ }
+
+ @Override
+ public void modified(String name) {
+ modified.add(name);
+ }
+ });
+ }
+
+ changes = (String) before.get("_c");
+ if (changes != null) {
+ parse(changes, new ParserCallback() {
+ @Override
+ public void added(String name) {
+ if (modified.remove(name) || !removed.remove(name)) {
+ added.add(name);
+ }
+ }
+
+ @Override
+ public void removed(String name) {
+ if (added.remove(name)) {
+ modified.add(name);
+ } else {
+ removed.add(name);
+ }
+ }
+
+ @Override
+ public void modified(String name) {
+ if (added.remove(name) || !removed.contains(name)) {
+ modified.add(name);
+ }
+ }
+ });
+ doc.put("_c", serialize(added, removed, modified));
+ }
+
+ // merge recursively
+ for (String k : before.keySet()) {
+ if (Utils.isPropertyName(k)) {
+ DBObject beforeChild = (DBObject) before.get(k);
+ DBObject thisChild = (DBObject) doc.get(k);
+ if (thisChild == null) {
+ thisChild = new BasicDBObject();
+ doc.put(k, thisChild);
+ }
+ mergeInternal(thisChild, beforeChild, added, removed,
modified);
+ }
+ }
+ }
+
+ private static String serialize(final Set<String> added,
+ final Set<String> removed,
+ final Set<String> modified) {
+ JsopWriter w = new JsopStream();
+ for (String p : added) {
+
w.tag('+').key(PathUtils.getName(p)).object().endObject().newline();
+ }
+ for (String p : removed) {
+ w.tag('-').value(PathUtils.getName(p)).newline();
+ }
+ for (String p : modified) {
+
w.tag('^').key(PathUtils.getName(p)).object().endObject().newline();
+ }
+ return w.toString();
+ }
+
+ private static void parse(String changes, ParserCallback callback) {
+ JsopTokenizer t = new JsopTokenizer(changes);
+ for (;;) {
+ int r = t.read();
+ if (r == JsopReader.END) {
+ break;
+ }
+ switch (r) {
+ case '+': {
+ callback.added(t.readString());
+ t.read(':');
+ t.read('{');
+ t.read('}');
+ break;
+ }
+ case '-': {
+ callback.removed(t.readString());
+ break;
+ }
+ case '^': {
+ callback.modified(t.readString());
+ t.read(':');
+ t.read('{');
+ t.read('}');
+ break;
+ }
+ default:
+ throw new IllegalArgumentException("jsonDiff: illegal
token '"
+ + t.getToken() + "' at pos: " + t.getLastPos()
+ ' ' + changes);
+ }
+ }
+ }
+
+ private void applyInternal(DBObject obj,
+ String path,
+ Entry entry) {
+ String diff = (String) obj.get("_c");
+ if (diff != null) {
+ entry.append(path, diff);
+ }
+ for (String k : obj.keySet()) {
+ if (Utils.isPropertyName(k)) {
+ String name = Utils.unescapePropertyName(k);
+ applyInternal((DBObject) obj.get(k),
PathUtils.concat(path, name), entry);
+ }
+ }
+ }
+
+ private interface ParserCallback {
+
+ void added(String name);
+ void removed(String name);
+ void modified(String name);
+ }
+ }
+}
Propchange:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCache.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1658624&r1=1658623&r2=1658624&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
Tue Feb 10 06:45:45 2015
@@ -50,7 +50,8 @@ class AmnesiaDiffCache implements DiffCa
}
@Override
- public void done() {
+ public boolean done() {
+ return false;
}
};
}
Added:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java?rev=1658624&view=auto
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
(added)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
Tue Feb 10 06:45:45 2015
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document.mongo;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.mongodb.DB;
+
+import org.apache.jackrabbit.oak.plugins.document.DiffCache;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
+import org.junit.Test;
+
+import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static
org.apache.jackrabbit.oak.plugins.document.DocumentStoreFixture.MONGO;
+import static
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDiffCache.Diff;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Tests for the MongoDiffCache.
+ */
+public class MongoDiffCacheTest {
+
+ @Test
+ public void diff() {
+ Revision from = Revision.fromString("r1-0-1");
+ Revision to = Revision.fromString("r2-0-1");
+ Diff diff = new Diff(from, to);
+ diff.append("/", "^\"foo\":{}");
+ diff.append("/foo", "^\"bar\":{}");
+ diff.append("/foo/bar", "-\"qux\"");
+
+ assertEquals("^\"foo\":{}", diff.getChanges("/"));
+ assertEquals("^\"bar\":{}", diff.getChanges("/foo"));
+ assertEquals("-\"qux\"", diff.getChanges("/foo/bar"));
+ assertEquals("", diff.getChanges("/baz"));
+ }
+
+ @Test
+ public void merge() {
+ assertEquals("+", doMerge("+", ""));
+ assertEquals("-", doMerge("-", ""));
+ assertEquals("^", doMerge("^", ""));
+
+ assertEquals("+", doMerge("+"));
+ assertEquals("^", doMerge("-", "+"));
+ assertEquals("^", doMerge("^", "-", "+"));
+ assertEquals("+", doMerge("+", "^", "-", "+"));
+
+ assertEquals("-", doMerge("-"));
+ assertEquals("-", doMerge("^", "-"));
+ assertEquals("", doMerge("+", "^", "-"));
+ assertEquals("-", doMerge("-", "+", "^", "-"));
+
+ assertEquals("^", doMerge("^"));
+ assertEquals("+", doMerge("+", "^"));
+ assertEquals("^", doMerge("-", "+", "^"));
+ assertEquals("^", doMerge("^", "-", "+", "^"));
+ }
+
+ @Test
+ public void sizeLimit() {
+ assumeTrue(MONGO.isAvailable());
+ DocumentStore store = MONGO.createDocumentStore();
+ assertTrue(store instanceof MongoDocumentStore);
+ DB db = ((MongoDocumentStore) store).getDBCollection(NODES).getDB();
+
+ MongoDiffCache diffCache = new MongoDiffCache(db, 32, new
DocumentMK.Builder());
+ DiffCache.Entry entry = diffCache.newEntry(
+ new Revision(1, 0, 1), new Revision(2, 0, 1));
+ for (int i = 0; i < 100; i++) {
+ for (int j = 0; j < 100; j++) {
+ for (int k = 0; k < 64; k++) {
+ entry.append("/node-" + i + "/node-" + j + "/node-" + k,
+ "^\"foo\":{}");
+ }
+ }
+ }
+ assertFalse(entry.done());
+
+ store.dispose();
+ }
+
+ private String doMerge(String... ops) {
+ List<String> opsList = Arrays.asList(ops);
+ Diff diff = null;
+ for (int i = opsList.size() - 1; i >= 0; i--) {
+ String op = opsList.get(i);
+ if (diff == null) {
+ diff = diffFromOp(op);
+ } else {
+ diff.mergeBeforeDiff(diffFromOp(op));
+ }
+ }
+ if (diff == null) {
+ return null;
+ }
+ String changes = diff.getChanges("/test");
+ if (changes == null) {
+ return null;
+ } else if (changes.length() == 0) {
+ return "";
+ } else {
+ return changes.substring(0, 1);
+ }
+ }
+
+ private static String changeFromOp(String op) {
+ if (op.length() == 0) {
+ return "";
+ }
+ String changes = op + "\"child\"";
+ if (!op.equals("-")) {
+ changes += ":{}";
+ }
+ return changes;
+ }
+
+ private static Diff diffFromOp(String op) {
+ Revision from = Revision.fromString("r1-0-1");
+ Revision to = Revision.fromString("r2-0-1");
+ Diff d = new Diff(from, to);
+ d.append("/test", changeFromOp(op));
+ return d;
+ }
+}
Propchange:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDiffCacheTest.java
------------------------------------------------------------------------------
svn:eol-style = native
