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 ch...@apache.org on 2014/10/31 08:44:49 UTC
svn commit: r1635715 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
Author: chetanm
Date: Fri Oct 31 07:44:49 2014
New Revision: 1635715
URL: http://svn.apache.org/r1635715
Log:
OAK-2117 - Reindex removes all nodes under index definition node
Merged 1627052
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1627052
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java?rev=1635715&r1=1635714&r2=1635715&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java Fri Oct 31 07:44:49 2014
@@ -47,6 +47,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -177,7 +178,9 @@ public class IndexUpdate implements Edit
// as we don't know the index content node name
// beforehand, we'll remove all child nodes
for (String rm : definition.getChildNodeNames()) {
- definition.getChildNode(rm).remove();
+ if (NodeStateUtils.isHidden(rm)) {
+ definition.getChildNode(rm).remove();
+ }
}
reindex.put(concat(getPath(), INDEX_DEFINITIONS_NAME, name), editor);
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1635715&r1=1635714&r2=1635715&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Fri Oct 31 07:44:49 2014
@@ -400,6 +400,33 @@ public class IndexUpdateTest {
};
}
+ @Test
+ public void reindexAndIndexDefnChildRemoval_OAK_2117() throws Exception{
+ builder.child("testRoot").setProperty("foo", "abc");
+ NodeState before = builder.getNodeState();
+
+ NodeBuilder nb = createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", false, false, ImmutableSet.of("foo"), null);
+ nb.child("prop1").setProperty("foo", "bar");
+
+ NodeState after = builder.getNodeState();
+
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
+
+ // first check that the index content nodes exist
+ NodeState ns = checkPathExists(indexed, INDEX_DEFINITIONS_NAME,
+ "rootIndex");
+
+ //Check index defn child node exist
+ checkPathExists(ns, "prop1");
+ checkPathExists(ns, INDEX_CONTENT_NODE_NAME);
+
+ // next, lookup
+ PropertyIndexLookup lookup = new PropertyIndexLookup(indexed);
+ assertEquals(ImmutableSet.of("testRoot"), find(lookup, "foo", "abc"));
+
+ }
+
private Set<String> find(PropertyIndexLookup lookup, String name,
String value) {
NodeState system = root.getChildNode(JCR_SYSTEM);