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 al...@apache.org on 2015/07/09 12:39:04 UTC
svn commit: r1690058 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Author: alexparvulescu
Date: Thu Jul 9 10:39:03 2015
New Revision: 1690058
URL: http://svn.apache.org/r1690058
Log:
OAK-3057 Simplify debugging conflict related errors
- merged r1690057
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 9 10:39:03 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023,1685370,1685552
,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689833,1689903,1690017,1690043,1690047
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023,1685370,1685552
,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689833,1689903,1690017,1690043,1690047,1690057
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java?rev=1690058&r1=1690057&r2=1690058&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java Thu Jul 9 10:39:03 2015
@@ -116,9 +116,9 @@ public final class MergingNodeStateDiff
if (LOG.isDebugEnabled()) {
String diff = JsopDiff.diffToJsop(ours, theirs);
LOG.debug(
- "{} resolved conflict of type {} with resolution {}, conflict trace {}",
+ "{} resolved conflict of type {} with resolution {} on node {}, conflict trace {}",
nodeConflictHandler, conflictType, resolution,
- diff);
+ name, diff);
}
}
}
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java?rev=1690058&r1=1690057&r2=1690058&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java Thu Jul 9 10:39:03 2015
@@ -24,6 +24,7 @@ import static org.junit.Assert.fail;
import static org.junit.matchers.JUnitMatchers.containsString;
import java.util.List;
+import java.util.Set;
import javax.jcr.InvalidItemStateException;
import javax.jcr.RepositoryException;
@@ -34,6 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.collect.Sets;
+
import ch.qos.logback.classic.Level;
public class ConflictResolutionTest extends AbstractRepositoryTest {
@@ -93,11 +96,10 @@ public class ConflictResolutionTest exte
session2.logout();
}
- // MergingNodeStateDif debug: [MergingNodeStateDiff]
- // NodeConflictHandler<DELETE_CHANGED_NODE> resolved conflict of
- // type DELETE_CHANGED_NODE with resolution THEIRS, conflict
- // trace ^"/metadata/updated":"myself"
- List<String> mnsdLogs = logMergingNodeStateDiff.getLogs();
+ // MergingNodeStateDif debug: NodeConflictHandler<DELETE_CHANGED_NODE>
+ // resolved conflict of type DELETE_CHANGED_NODE with resolution THEIRS
+ // on node jcr:content, conflict trace ^"/metadata/updated":"myself"
+ Set<String> mnsdLogs = Sets.newHashSet(logMergingNodeStateDiff.getLogs());
assertTrue(mnsdLogs.size() == 1);
assertThat(
"MergingNodeStateDiff log message must contain a reference to the handler",
@@ -114,7 +116,7 @@ public class ConflictResolutionTest exte
// ConflictValidator debug: Commit failed due to unresolved
// conflicts in /node = {deleteChangedNode = {jcr:content}}
- List<String> cvLogs = logConflictValidator.getLogs();
+ Set<String> cvLogs = Sets.newHashSet(logConflictValidator.getLogs());
assertTrue(cvLogs.size() == 1);
assertThat(
"ConflictValidator log message must contain a reference to the path",