Author: chetanm
Date: Fri Nov 13 16:45:21 2015
New Revision: 1714238
URL: http://svn.apache.org/viewvc?rev=1714238&view=rev
Log:
OAK-3630 - Mixin based rules not working for relative properties
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java?rev=1714238&r1=1714237&r2=1714238&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
Fri Nov 13 16:45:21 2015
@@ -30,7 +30,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.ConfigUtil;
@@ -79,7 +78,7 @@ class Aggregate {
}
public void collectAggregates(NodeState root, ResultCollector collector) {
- if (nodeTypeName.equals(ConfigUtil.getPrimaryTypeName(root))) {
+ if (matchingType(nodeTypeName, root)) {
List<Matcher> matchers = createMatchers();
collectAggregates(root, matchers, collector);
}
@@ -111,6 +110,19 @@ class Aggregate {
return nodeTypeName;
}
+ private static boolean matchingType(String nodeTypeName, NodeState
nodeState) {
+ if (nodeTypeName.equals(ConfigUtil.getPrimaryTypeName(nodeState))) {
+ return true;
+ }
+
+ for (String mixin : ConfigUtil.getMixinNames(nodeState)) {
+ if (nodeTypeName.equals(mixin)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private static void collectAggregates(NodeState nodeState, List<Matcher>
matchers,
ResultCollector collector) {
for (ChildNodeEntry cne : nodeState.getChildNodeEntries()) {
@@ -231,7 +243,7 @@ class Aggregate {
//last segment -> add to collector if node type matches
if (depth == maxDepth() - 1
&& primaryType != null
- &&
!primaryType.equals(ConfigUtil.getPrimaryTypeName(nodeState))) {
+ && !matchingType(primaryType, nodeState)) {
return false;
}
return super.match(name, nodeState, depth);
@@ -256,7 +268,19 @@ class Aggregate {
@Override
public Aggregate getAggregate(NodeState matchedNodeState) {
- return
aggMapper.getAggregate(ConfigUtil.getPrimaryTypeName(matchedNodeState));
+ //Check agg defn for primaryType first
+ Aggregate agg =
aggMapper.getAggregate(ConfigUtil.getPrimaryTypeName(matchedNodeState));
+
+ //If not found then look for defn for mixins
+ if (agg == null) {
+ for (String mixin :
ConfigUtil.getMixinNames(matchedNodeState)) {
+ agg = aggMapper.getAggregate(mixin);
+ if (agg != null) {
+ break;
+ }
+ }
+ }
+ return agg;
}
@Override
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java?rev=1714238&r1=1714237&r2=1714238&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
Fri Nov 13 16:45:21 2015
@@ -19,6 +19,8 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
+import java.util.Collections;
+
import com.google.common.primitives.Ints;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Blob;
@@ -60,6 +62,11 @@ public class ConfigUtil {
return (ps == null) ? JcrConstants.NT_BASE : ps.getValue(Type.NAME);
}
+ public static Iterable<String> getMixinNames(NodeState nodeState) {
+ PropertyState ps = nodeState.getProperty(JcrConstants.JCR_MIXINTYPES);
+ return (ps == null) ? Collections.<String>emptyList() :
ps.getValue(Type.NAMES);
+ }
+
/**
* Assumes that given state is of type nt:file and then reads
* the jcr:content/@jcr:data property to get the binary content
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java?rev=1714238&r1=1714237&r2=1714238&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java
Fri Nov 13 16:45:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.2.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java?rev=1714238&r1=1714237&r2=1714238&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
Fri Nov 13 16:45:21 2015
@@ -20,13 +20,15 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.lucene.Aggregate.NodeInclude;
import
org.apache.jackrabbit.oak.plugins.index.lucene.Aggregate.NodeIncludeResult;
@@ -39,6 +41,7 @@ import static com.google.common.base.Pre
import static com.google.common.collect.ImmutableList.of;
import static com.google.common.collect.Iterables.toArray;
import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_RULES;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -96,6 +99,18 @@ public class AggregateTest {
}
@Test
+ public void oneLevelTypedMixin() throws Exception{
+ Aggregate ag = new Aggregate("nt:base", of(ni("mix:title","*",
false)));
+ NodeBuilder nb = newNode("nt:base");
+ nb.child("a").setProperty(JcrConstants.JCR_MIXINTYPES,
Collections.singleton("mix:title"), Type.NAMES);
+ nb.child("b");
+
+ ag.collectAggregates(nb.getNodeState(), col);
+ assertEquals(1, col.getNodePaths().size());
+ assertThat(col.getNodePaths(), hasItems("a"));
+ }
+
+ @Test
public void multiLevelAll() throws Exception{
Aggregate ag = new Aggregate("nt:base", of(ni("*"), ni("*/*")));
NodeBuilder nb = newNode("nt:base");
@@ -259,6 +274,37 @@ public class AggregateTest {
}
@Test
+ public void testReaggregateMixin() throws Exception{
+ //A variant of testReaggregation but using mixin
+ //instead of normal nodetype. It abuses mix:title
+ //and treat it like nt:file. Test check if reaggregation
+ //works for mixins also
+
+ //Enable relative include for all child nodes of nt:folder
+ //So indexing would create fulltext field for each relative nodes
+ Aggregate agFolder = new Aggregate("nt:folder", of(ni("mix:title",
"*", true)));
+
+ Aggregate agFile = new Aggregate("mix:title", of(ni(null,
"jcr:content", true)));
+ mapper.add("mix:title", agFile);
+ mapper.add("nt:folder", agFolder);
+
+ NodeBuilder nb = newNode("nt:folder");
+ nb.child("a").child("c");
+ createFileMixin(nb, "b", "hello world");
+ createFileMixin(nb, "c", "hello world");
+
+ agFolder.collectAggregates(nb.getNodeState(), col);
+ assertEquals(4, col.getNodePaths().size());
+ assertThat(col.getNodePaths(), hasItems("b", "c", "b/jcr:content",
"c/jcr:content"));
+
+ assertEquals(2, col.nodeResults.get("b/jcr:content").size());
+
+ //Check that a result is provided for relative node 'b'. Actual node
provided
+ //is b/jcr:content
+ assertEquals(1, col.getRelativeNodeResults("b/jcr:content",
"b").size());
+ }
+
+ @Test
public void testRelativeNodeInclude() throws Exception{
//Enable relative include for all child nodes of nt:folder
//So indexing would create fulltext field for each relative nodes
@@ -285,6 +331,12 @@ public class AggregateTest {
.child("jcr:content").setProperty("jcr:data",
content.getBytes());
}
+ private static void createFileMixin(NodeBuilder nb, String fileName,
String content){
+ //Abusing mix:title as its registered by default
+ nb.child(fileName).setProperty(JCR_MIXINTYPES,
Collections.singleton("mix:title"), Type.NAMES)
+ .child("jcr:content").setProperty("jcr:data",
content.getBytes());
+ }
+
//~---------------------------------< Prop Includes >
@Test
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1714238&r1=1714237&r2=1714238&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Fri Nov 13 16:45:21 2015
@@ -1753,6 +1753,36 @@ public class LucenePropertyIndexTest ext
assertQuery(propabQuery, asList("/test/a"));
}
+ @Test
+ public void indexingBasedOnMixinAndRelativeProps() throws Exception {
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ Tree props = TestUtil.newRulePropTree(idx, "mix:title");
+ Tree prop1 = props.addChild(TestUtil.unique("prop"));
+ prop1.setProperty(LuceneIndexConstants.PROP_NAME, "jcr:title");
+ prop1.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true);
+
+ Tree prop2 = props.addChild(TestUtil.unique("prop"));
+ prop2.setProperty(LuceneIndexConstants.PROP_NAME, "jcr:content/type");
+ prop2.setProperty(LuceneIndexConstants.PROP_PROPERTY_INDEX, true);
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree a = createNodeWithMixinType(test, "a", "mix:title");
+ a.setProperty("jcr:title", "a");
+ a.addChild("jcr:content").setProperty("type", "foo-a");
+
+ Tree c = createNodeWithMixinType(test, "c", "mix:title");
+ c.setProperty("jcr:title", "c");
+ c.addChild("jcr:content").setProperty("type", "foo-c");
+
+ test.addChild("c").setProperty("jcr:title", "a");
+ root.commit();
+
+ String propabQuery = "select [jcr:path] from [mix:title] where
[jcr:content/type] = 'foo-a'";
+ assertThat(explain(propabQuery),
containsString("lucene:test1(/oak:index/test1)"));
+ assertQuery(propabQuery, asList("/test/a"));
+ }
+
private static Tree createNodeWithMixinType(Tree t, String nodeName,
String typeName){
t = t.addChild(nodeName);
t.setProperty(JcrConstants.JCR_MIXINTYPES,
Collections.singleton(typeName), Type.NAMES);
