Author: chetanm
Date: Mon Nov 16 04:46:04 2015
New Revision: 1714515
URL: http://svn.apache.org/viewvc?rev=1714515&view=rev
Log:
OAK-3630 - Mixin based rules not working for relative properties
Merging 1714238
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 16 04:46:04 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696190,1696194,1696
242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1711498,1712042,1712319,1
712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696190,1696194,1696
242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1711498,1712042,1712319,1
712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java?rev=1714515&r1=1714514&r2=1714515&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
Mon Nov 16 04:46:04 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/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java?rev=1714515&r1=1714514&r2=1714515&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ConfigUtil.java
Mon Nov 16 04:46:04 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/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java?rev=1714515&r1=1714514&r2=1714515&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AggregateTest.java
Mon Nov 16 04:46:04 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/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1714515&r1=1714514&r2=1714515&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Mon Nov 16 04:46:04 2015
@@ -1645,6 +1645,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);
