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 ju...@apache.org on 2014/05/01 19:24:21 UTC
svn commit: r1591715 -
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Author: jukka
Date: Thu May 1 17:24:21 2014
New Revision: 1591715
URL: http://svn.apache.org/r1591715
Log:
OAK-1789: Upgraded version history has UUIDs as jcr:frozenUuid of non-referenceable nodes
Need to set the child order property only after child nodes have been loaded
Fix the primary type tracking in the frozenUuuid code.
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1591715&r1=1591714&r2=1591715&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java Thu May 1 17:24:21 2014
@@ -32,6 +32,7 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.JcrConstants.MIX_REFERENCEABLE;
+import static org.apache.jackrabbit.JcrConstants.NT_BASE;
import static org.apache.jackrabbit.JcrConstants.NT_FROZENNODE;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -131,6 +132,8 @@ class JackrabbitNodeState extends Abstra
this.uriToPrefix = parent.uriToPrefix;
this.properties = createProperties(bundle);
this.nodes = createNodes(bundle);
+ setChildOrder();
+ fixFrozenUuid();
this.useBinaryReferences = parent.useBinaryReferences;
logNewNode(this);
}
@@ -151,6 +154,7 @@ class JackrabbitNodeState extends Abstra
NodePropBundle bundle = loader.loadBundle(id);
this.properties = createProperties(bundle);
this.nodes = createNodes(bundle);
+ setChildOrder();
} catch (ItemStateException e) {
throw new IllegalStateException("Unable to access node " + id, e);
}
@@ -239,6 +243,13 @@ class JackrabbitNodeState extends Abstra
//-----------------------------------------------------------< private >--
+ private void setChildOrder() {
+ if (isOrderable.apply(this)) {
+ properties.put(OAK_CHILD_ORDER, PropertyStates.createProperty(
+ OAK_CHILD_ORDER, nodes.keySet(), Type.NAMES));
+ }
+ }
+
private Map<String, NodeId> createNodes(NodePropBundle bundle) {
Map<String, NodeId> children = newLinkedHashMap();
for (ChildNodeEntry entry : bundle.getChildNodeEntries()) {
@@ -282,11 +293,6 @@ class JackrabbitNodeState extends Abstra
JCR_UUID, bundle.getId().toString()));
}
- if (isOrderable.apply(primary, mixins)) {
- properties.put(OAK_CHILD_ORDER, PropertyStates.createProperty(
- OAK_CHILD_ORDER, nodes.keySet(), Type.NAMES));
- }
-
for (PropertyEntry property : bundle.getPropertyEntries()) {
String name = createName(property.getName());
try {
@@ -303,18 +309,22 @@ class JackrabbitNodeState extends Abstra
}
}
+ return properties;
+ }
+
+ private void fixFrozenUuid() {
// OAK-1789: Convert the jcr:frozenUuid of a non-referenceable
// frozen node from UUID to a path identifier
PropertyState frozenUuid = properties.get(JCR_FROZENUUID);
if (frozenUuid != null
&& frozenUuid.getType() == STRING
- && isFrozenNode.apply(primary, mixins)) {
- String frozenPrimary = NT_UNSTRUCTURED;
+ && isFrozenNode.apply(this)) {
+ String frozenPrimary = NT_BASE;
Set<String> frozenMixins = newHashSet();
PropertyState property = properties.get(JCR_FROZENPRIMARYTYPE);
if (property != null && property.getType() == NAME) {
- primary = property.getValue(NAME);
+ frozenPrimary = property.getValue(NAME);
}
property = properties.get(JCR_FROZENMIXINTYPES);
if (property != null && property.getType() == NAMES) {
@@ -328,8 +338,6 @@ class JackrabbitNodeState extends Abstra
properties.put(JCR_FROZENUUID, frozenUuid);
}
}
-
- return properties;
}
private org.apache.jackrabbit.oak.api.PropertyState createProperty(