Index: src/test/repository/workspaces/indexing-test/indexing-configuration.xml
===================================================================
--- src/test/repository/workspaces/indexing-test/indexing-configuration.xml (revision 1128221)
+++ src/test/repository/workspaces/indexing-test/indexing-configuration.xml (working copy)
@@ -46,6 +46,12 @@
+
+ *
+ *
+ nt:file/jcr:content
+
+
jcr:content
jcr:content/*
Index: src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java
===================================================================
--- src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java (revision 1128325)
+++ src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java (working copy)
@@ -46,6 +46,74 @@
testRootNode.getSession().save();
}
+ /**
+ *
+ * this test is very similar to
+ * {@link SQL2IndexingAggregateTest#testNtFileAggregate()
+ * testNtFileAggregate} but checks embedded index aggregates.
+ *
+ * The aggregation hierarchy is defined in
+ * src/test/repository/workspaces/indexing-test/indexing-configuration.xml
+ *
+ * basically a folder aggregates other folders and files that aggregate a
+ * stream of content.
+ *
+ * see JCR-2989
+ *
+ */
+ public void testDeepHierarchy() throws Exception {
+ int levelsDeep = 3;
+
+ String sqlBase = "SELECT * FROM [nt:folder] as f"
+ + " WHERE ISCHILDNODE([" + testRoot + "])";
+ String sqlCat = sqlBase + " AND CONTAINS (f.*, 'cat')";
+ String sqlDog = sqlBase + " AND CONTAINS (f.*, 'dog')";
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ Writer writer = new OutputStreamWriter(out, "UTF-8");
+ writer.write("the quick brown fox jumps over the lazy dog.");
+ writer.flush();
+
+ Node folderRoot = testRootNode.addNode("myFolder", "nt:folder");
+ Node folderChild = folderRoot;
+ for (int i = 0; i < levelsDeep; i++) {
+ folderChild = folderChild.addNode("0" + i, "nt:folder");
+ }
+
+ Node file = folderChild.addNode("myFile", "nt:file");
+ Node resource = file.addNode("jcr:content", "nt:resource");
+ resource.setProperty("jcr:lastModified", Calendar.getInstance());
+ resource.setProperty("jcr:encoding", "UTF-8");
+ resource.setProperty("jcr:mimeType", "text/plain");
+ resource.setProperty("jcr:data", session.getValueFactory()
+ .createBinary(new ByteArrayInputStream(out.toByteArray())));
+
+ testRootNode.getSession().save();
+ executeSQL2Query(sqlDog, new Node[] { folderRoot });
+
+ // update jcr:data
+ out.reset();
+ writer.write("the quick brown fox jumps over the lazy cat.");
+ writer.flush();
+ resource.setProperty("jcr:data", session.getValueFactory()
+ .createBinary(new ByteArrayInputStream(out.toByteArray())));
+ testRootNode.getSession().save();
+ executeSQL2Query(sqlCat, new Node[] { folderRoot });
+
+ // replace jcr:content with unstructured
+ resource.remove();
+ Node unstrContent = file.addNode("jcr:content", "nt:unstructured");
+ Node foo = unstrContent.addNode("foo");
+ foo.setProperty("text", "the quick brown fox jumps over the lazy dog.");
+ testRootNode.getSession().save();
+ executeSQL2Query(sqlDog, new Node[] { folderRoot });
+ // remove foo
+ foo.remove();
+
+ testRootNode.getSession().save();
+ executeSQL2Query(sqlDog, new Node[] {});
+ }
+
public void testNtFileAggregate() throws Exception {
String sqlBase = "SELECT * FROM [nt:file] as f"
Index: src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (revision 1131652)
+++ src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (working copy)
@@ -1587,10 +1587,10 @@
*
* @param state the node state for which we want to retrieve the aggregate
* root.
- * @param map aggregate roots are collected in this map.
+ * @param aggregates aggregate roots are collected in this map.
*/
- protected void retrieveAggregateRoot(
- NodeState state, Map map) {
+ protected void retrieveAggregateRoot(NodeState state,
+ Map aggregates) {
if (indexingConfig != null) {
AggregateRule[] aggregateRules = indexingConfig.getAggregateRules();
if (aggregateRules == null) {
@@ -1600,7 +1600,9 @@
for (AggregateRule aggregateRule : aggregateRules) {
NodeState root = aggregateRule.getAggregateRoot(state);
if (root != null) {
- map.put(root.getNodeId(), root);
+ aggregates.put(root.getNodeId(), root);
+ // JCR-2989 Support for embedded index aggregates
+ retrieveAggregateRoot(root, aggregates);
}
}
} catch (Exception e) {
@@ -1615,10 +1617,10 @@
* and puts it into map.
*
* @param removedIds the ids of removed nodes.
- * @param map aggregate roots are collected in this map
+ * @param aggregates aggregate roots are collected in this map
*/
protected void retrieveAggregateRoot(
- Set removedIds, Map map) {
+ Set removedIds, Map aggregates) {
if (indexingConfig != null) {
AggregateRule[] aggregateRules = indexingConfig.getAggregateRules();
if (aggregateRules == null) {
@@ -1642,8 +1644,14 @@
Document doc = reader.document(
tDocs.doc(), FieldSelectors.UUID);
NodeId nId = new NodeId(doc.get(FieldNames.UUID));
- map.put(nId, (NodeState) ism.getItemState(nId));
+ NodeState nodeState = (NodeState) ism.getItemState(nId);
+ aggregates.put(nId, nodeState);
found++;
+
+ // JCR-2989 Support for embedded index aggregates
+ int sizeBefore = aggregates.size();
+ retrieveAggregateRoot(nodeState, aggregates);
+ found += aggregates.size() - sizeBefore;
}
}
} finally {