Hi,
I think this breaks the build. The following test fails for me:
addNodes[2](org.apache.jackrabbit.oak.jcr.ConcurrentAddIT) Time elapsed:
2.132 sec <<< ERROR!
java.lang.ClassCastException: java.lang.Long cannot be cast to
java.util.SortedMap
at
org.apache.jackrabbit.oak.plugins.document.NodeDocument.getLocalMap(NodeDoc
ument.java:1091)
at
org.apache.jackrabbit.oak.plugins.document.SplitOperations.getCommittedLoca
lChanges(SplitOperations.java:356)
at
org.apache.jackrabbit.oak.plugins.document.SplitOperations.create(SplitOper
ations.java:114)
at
org.apache.jackrabbit.oak.plugins.document.SplitOperations.forDocument(Spli
tOperations.java:103)
at
org.apache.jackrabbit.oak.plugins.document.NodeDocument.split(NodeDocument.
java:954)
at
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore.backgroundSpli
t(DocumentNodeStore.java:1581)
Regards
Marcel
On 02/12/14 15:52, "[email protected]" <[email protected]> wrote:
>Author: reschke
>Date: Tue Dec 2 14:52:01 2014
>New Revision: 1642888
>
>URL: http://svn.apache.org/r1642888
>Log:
>OAK-1941 - remove special-handling of _collisionsModCount
>
>Modified:
>
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plug
>ins/document/NodeDocument.java
>
>Modified:
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plug
>ins/document/NodeDocument.java
>URL:
>http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/o
>rg/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1642888&r1
>=1642887&r2=1642888&view=diff
>==========================================================================
>====
>---
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plug
>ins/document/NodeDocument.java (original)
>+++
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plug
>ins/document/NodeDocument.java Tue Dec 2 14:52:01 2014
>@@ -126,11 +126,6 @@ public final class NodeDocument extends
> public static final String COLLISIONS = "_collisions";
>
> /**
>- * Optional counter for changes to {@link #COLLISIONS} map.
>- */
>- public static final String COLLISIONSMODCOUNT =
>"_collisionsModCount";
>-
>- /**
> * The modified time in seconds (5 second resolution).
> */
> public static final String MODIFIED_IN_SECS = "_modified";
>@@ -318,7 +313,7 @@ public final class NodeDocument extends
> * Properties to ignore when a document is split (see OAK-2044).
> */
> static final Set<String> IGNORE_ON_SPLIT = ImmutableSet.of(
>- ID, MOD_COUNT, COLLISIONSMODCOUNT, MODIFIED_IN_SECS,
>PREVIOUS, LAST_REV, CHILDREN_FLAG,
>+ ID, MOD_COUNT, MODIFIED_IN_SECS, PREVIOUS, LAST_REV,
>CHILDREN_FLAG,
> HAS_BINARY_FLAG, PATH, DELETED_ONCE, COLLISIONS);
>
> public static final long HAS_BINARY_VAL = 1;
>
>
