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 2015/03/05 13:38:36 UTC
svn commit: r1664332 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/
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 Mar 5 12:38:35 2015
New Revision: 1664332
URL: http://svn.apache.org/r1664332
Log:
OAK-2562: DiffCache is inefficient
Revert on 1.0 branch until this change is better tested
Removed:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.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/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 5 12:38:35 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,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,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,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,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,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-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,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,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,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663241,1663275,1663288,1663448,1663565,1663666,1663705,1663730,1664038,1664184,1664228-1664229,1664231
+/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,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,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,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,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,1
628262,1628447,1628608,1629688,1629840,1629917,1630055-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,164211
9,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,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,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663241,1663275,1663288,1663448,1663666,1663730,1664038,1664184,1664228-1664229,1664231
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java?rev=1664332&r1=1664331&r2=1664332&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java Thu Mar 5 12:38:35 2015
@@ -61,7 +61,7 @@ public class JsopDiff implements NodeSta
this(blobs, "/");
}
- public JsopDiff(String path, int depth) {
+ JsopDiff(String path, int depth) {
this(new JsopBuilder(), new BlobSerializer(), path, depth);
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1664332&r1=1664331&r2=1664332&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Thu Mar 5 12:38:35 2015
@@ -57,6 +57,7 @@ import com.google.common.collect.Iterato
import com.google.common.collect.Maps;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.plugins.document.util.Utils.unshareString;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
/**
@@ -264,7 +265,8 @@ public class DocumentNodeState extends A
// use DocumentNodeStore compare
final long start = perfLogger.start();
try {
- return store.compare(this, mBase, diff);
+ return dispatch(store.diffChildren(this, mBase),
+ mBase, diff);
} finally {
perfLogger
.end(start,
@@ -409,6 +411,64 @@ public class DocumentNodeState extends A
|| this.lastRevision.equals(other.lastRevision);
}
+ private boolean dispatch(@Nonnull String jsonDiff,
+ @Nonnull DocumentNodeState base,
+ @Nonnull NodeStateDiff diff) {
+ if (!AbstractNodeState.comparePropertiesAgainstBaseState(this, base, diff)) {
+ return false;
+ }
+ if (jsonDiff.trim().isEmpty()) {
+ return true;
+ }
+ JsopTokenizer t = new JsopTokenizer(jsonDiff);
+ boolean continueComparison = true;
+ while (continueComparison) {
+ int r = t.read();
+ if (r == JsopReader.END) {
+ break;
+ }
+ switch (r) {
+ case '+': {
+ String name = unshareString(t.readString());
+ t.read(':');
+ t.read('{');
+ while (t.read() != '}') {
+ // skip properties
+ }
+ continueComparison = diff.childNodeAdded(name, getChildNode(name));
+ break;
+ }
+ case '-': {
+ String name = unshareString(t.readString());
+ continueComparison = diff.childNodeDeleted(name, base.getChildNode(name));
+ break;
+ }
+ case '^': {
+ String name = unshareString(t.readString());
+ t.read(':');
+ if (t.matches('{')) {
+ t.read('}');
+ continueComparison = diff.childNodeChanged(name,
+ base.getChildNode(name), getChildNode(name));
+ } else if (t.matches('[')) {
+ // ignore multi valued property
+ while (t.read() != ']') {
+ // skip values
+ }
+ } else {
+ // ignore single valued property
+ t.read();
+ }
+ break;
+ }
+ default:
+ throw new IllegalArgumentException("jsonDiff: illegal token '"
+ + t.getToken() + "' at pos: " + t.getLastPos() + ' ' + jsonDiff);
+ }
+ }
+ return continueComparison;
+ }
+
/**
* Returns up to {@code limit} child node entries, starting after the given
* {@code name}.
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=1664332&r1=1664331&r2=1664332&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 Mar 5 12:38:35 2015
@@ -21,13 +21,11 @@ import static com.google.common.base.Pre
import static com.google.common.collect.Iterables.toArray;
import static com.google.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.api.CommitFailedException.MERGE;
-import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.apache.jackrabbit.oak.plugins.document.DocumentMK.FAST_DIFF;
import static org.apache.jackrabbit.oak.plugins.document.DocumentMK.MANY_CHILDREN_THRESHOLD;
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
-import static org.apache.jackrabbit.oak.plugins.document.util.Utils.unshareString;
import java.io.Closeable;
import java.io.IOException;
@@ -94,10 +92,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
-import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.util.PerfLogger;
@@ -836,7 +832,7 @@ public final class DocumentNodeStore
String to = Utils.getKeyUpperLimit(checkNotNull(path));
String from;
if (name != null) {
- from = Utils.getIdFromPath(concat(path, name));
+ from = Utils.getIdFromPath(PathUtils.concat(path, name));
} else {
from = Utils.getKeyLowerLimit(path);
}
@@ -861,7 +857,7 @@ public final class DocumentNodeStore
} else if (c.childNames.size() < limit && !c.isComplete) {
// fetch more and update cache
String lastName = c.childNames.get(c.childNames.size() - 1);
- String lastPath = concat(path, lastName);
+ String lastPath = PathUtils.concat(path, lastName);
from = Utils.getIdFromPath(lastPath);
int remainingLimit = limit - c.childNames.size();
List<NodeDocument> docs = store.query(Collection.NODES,
@@ -878,7 +874,7 @@ public final class DocumentNodeStore
Iterable<NodeDocument> it = transform(c.childNames, new Function<String, NodeDocument>() {
@Override
public NodeDocument apply(String name) {
- String p = concat(path, name);
+ String p = PathUtils.concat(path, name);
NodeDocument doc = store.find(Collection.NODES, Utils.getIdFromPath(p));
if (doc == null) {
docChildrenCache.invalidateAll();
@@ -919,7 +915,7 @@ public final class DocumentNodeStore
new Function<String, DocumentNodeState>() {
@Override
public DocumentNodeState apply(String input) {
- String p = concat(parent.getPath(), input);
+ String p = PathUtils.concat(parent.getPath(), input);
DocumentNodeState result = getNode(p, readRevision);
if (result == null) {
throw new DocumentStoreException("DocumentNodeState is null for revision " + readRevision + " of " + p
@@ -1251,42 +1247,26 @@ public final class DocumentNodeStore
/**
* Compares the given {@code node} against the {@code base} state and
- * reports the differences to the {@link NodeStateDiff}.
+ * reports the differences on the children as a json diff string. This
+ * method does not report any property changes between the two nodes.
*
* @param node the node to compare.
* @param base the base node to compare against.
- * @param diff handler of node state differences
- * @return {@code true} if the full diff was performed, or
- * {@code false} if it was aborted as requested by the handler
- * (see the {@link NodeStateDiff} contract for more details)
- */
- boolean compare(@Nonnull final DocumentNodeState node,
- @Nonnull final DocumentNodeState base,
- @Nonnull final NodeStateDiff diff) {
- if (!AbstractNodeState.comparePropertiesAgainstBaseState(node, base, diff)) {
- return false;
- }
+ * @return the json diff.
+ */
+ String diffChildren(@Nonnull final DocumentNodeState node,
+ @Nonnull final DocumentNodeState base) {
if (node.hasNoChildren() && base.hasNoChildren()) {
- return true;
- }
- boolean useReadRevision = true;
- // first lookup with read revisions of nodes and without loader
- String jsop = diffCache.getChanges(base.getRevision(),
- node.getRevision(), node.getPath(), null);
- if (jsop == null) {
- useReadRevision = false;
- // fall back to last revisions with loader, this
- // guarantees we get a diff
- jsop = diffCache.getChanges(base.getLastRevision(),
- node.getLastRevision(), node.getPath(),
- new DiffCache.Loader() {
- @Override
- public String call() {
- return diffImpl(base, node);
- }
- });
+ return "";
}
- return dispatch(jsop, node, base, diff, useReadRevision);
+ 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,
@@ -1327,13 +1307,13 @@ public final class DocumentNodeStore
t.read(':');
t.read('{');
t.read('}');
- writer.tag((char) r).key(concat(path, name));
+ writer.tag((char) r).key(PathUtils.concat(path, name));
writer.object().endObject().newline();
break;
}
case '-': {
String name = t.readString();
- writer.tag('-').value(concat(path, name));
+ writer.tag('-').value(PathUtils.concat(path, name));
writer.newline();
}
}
@@ -1725,69 +1705,6 @@ public final class DocumentNodeStore
//-----------------------------< internal >---------------------------------
- private boolean dispatch(@Nonnull String jsonDiff,
- @Nonnull DocumentNodeState node,
- @Nonnull DocumentNodeState base,
- @Nonnull NodeStateDiff diff,
- boolean useReadRevision) {
- if (jsonDiff.trim().isEmpty()) {
- return true;
- }
- Revision nodeRev = useReadRevision ? node.getRevision() : node.getLastRevision();
- Revision baseRev = useReadRevision ? base.getRevision() : base.getLastRevision();
- JsopTokenizer t = new JsopTokenizer(jsonDiff);
- boolean continueComparison = true;
- while (continueComparison) {
- int r = t.read();
- if (r == JsopReader.END) {
- break;
- }
- switch (r) {
- case '+': {
- String name = unshareString(t.readString());
- t.read(':');
- t.read('{');
- while (t.read() != '}') {
- // skip properties
- }
- NodeState child = getNode(concat(node.getPath(), name), nodeRev);
- continueComparison = diff.childNodeAdded(name, child);
- break;
- }
- case '-': {
- String name = unshareString(t.readString());
- NodeState child = getNode(concat(base.getPath(), name), baseRev);
- continueComparison = diff.childNodeDeleted(name, child);
- break;
- }
- case '^': {
- String name = unshareString(t.readString());
- t.read(':');
- if (t.matches('{')) {
- t.read('}');
- NodeState nodeChild = getNode(concat(node.getPath(), name), nodeRev);
- NodeState baseChild = getNode(concat(base.getPath(), name), baseRev);
- continueComparison = diff.childNodeChanged(
- name, baseChild, nodeChild);
- } else if (t.matches('[')) {
- // ignore multi valued property
- while (t.read() != ']') {
- // skip values
- }
- } else {
- // ignore single valued property
- t.read();
- }
- break;
- }
- default:
- throw new IllegalArgumentException("jsonDiff: illegal token '"
- + t.getToken() + "' at pos: " + t.getLastPos() + ' ' + jsonDiff);
- }
- }
- return continueComparison;
- }
-
/**
* Creates a tracker for the given commit revision.
*
@@ -1811,7 +1728,7 @@ public final class DocumentNodeStore
// changed or removed properties
PropertyState toValue = to.getProperty(name);
if (!fromValue.equals(toValue)) {
- w.tag('^').key(concat(from.getPath(), name));
+ w.tag('^').key(PathUtils.concat(from.getPath(), name));
if (toValue == null) {
w.value(null);
} else {
@@ -1822,7 +1739,7 @@ public final class DocumentNodeStore
for (String name : to.getPropertyNames()) {
// added properties
if (!from.hasProperty(name)) {
- w.tag('^').key(concat(from.getPath(), name))
+ w.tag('^').key(PathUtils.concat(from.getPath(), name))
.encodedValue(to.getPropertyAsString(name)).newline();
}
}
@@ -1957,7 +1874,7 @@ public final class DocumentNodeStore
if (!childrenSet.contains(n)) {
w.tag('-').value(n).newline();
} else {
- String path = concat(parentPath, n);
+ String path = PathUtils.concat(parentPath, n);
DocumentNodeState n1 = getNode(path, fromRev);
DocumentNodeState n2 = getNode(path, toRev);
// this is not fully correct:
@@ -2020,7 +1937,7 @@ public final class DocumentNodeStore
}
for (DocumentNodeState child : getChildNodes(source, null, Integer.MAX_VALUE)) {
String childName = PathUtils.getName(child.getPath());
- String destChildPath = concat(targetPath, childName);
+ String destChildPath = PathUtils.concat(targetPath, childName);
moveOrCopyNode(move, child, destChildPath, commit);
}
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java?rev=1664332&r1=1664331&r2=1664332&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java Thu Mar 5 12:38:35 2015
@@ -43,7 +43,6 @@ public abstract class AbstractMongoConne
public void setUpConnection() throws Exception {
mongoConnection = MongoUtils.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
- Revision.setClock(getTestClock());
mk = new DocumentMK.Builder().clock(getTestClock()).setMongoDB(mongoConnection.getDB()).open();
}
@@ -59,7 +58,6 @@ public abstract class AbstractMongoConne
mongoConnection = MongoUtils.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mongoConnection.close();
- Revision.resetClockToDefault();
}
@Override
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java?rev=1664332&r1=1664331&r2=1664332&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java Thu Mar 5 12:38:35 2015
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collections;
-import org.apache.jackrabbit.oak.kernel.JsopDiff;
import org.apache.jackrabbit.oak.plugins.document.util.TimingDocumentStoreWrapper;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -111,10 +110,9 @@ public class DocumentNodeStoreIT extends
ns1.runBackgroundOperations();
ns2.runBackgroundOperations();
- JsopDiff diff = new JsopDiff("", 0);
- ns1.compare(root2, root1, diff);
+ String diff = ns1.diffChildren(root2, root1);
// must report /node as changed
- assertEquals("^\"node\":{}", diff.toString());
+ assertEquals("^\"node\":{}", diff.trim());
ns1.dispose();
ns2.dispose();