Author: chetanm
Date: Mon Nov 16 09:23:58 2015
New Revision: 1714527
URL: http://svn.apache.org/viewvc?rev=1714527&view=rev
Log:
OAK-3591 - Lucene index with 'analyzed=true' sometimes used by mistake
Merging 1714519,1714520
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/IndexDefinition.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 16 09:23:58 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,1714238
+/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,1714519-1714520
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Mon Nov 16 09:23:58 2015
@@ -633,6 +633,7 @@ class IndexDefinition implements Aggrega
final int propertyTypes;
final boolean fulltextEnabled;
final boolean propertyIndexEnabled;
+ final boolean nodeFullTextIndexed;
final Aggregate aggregate;
final Aggregate propAggregate;
@@ -660,8 +661,9 @@ class IndexDefinition implements Aggrega
this.nullCheckEnabledProperties =
ImmutableList.copyOf(nonExistentProperties);
this.notNullCheckEnabledProperties =
ImmutableList.copyOf(existentProperties);
this.fulltextEnabled = aggregate.hasNodeAggregates() ||
hasAnyFullTextEnabledProperty();
+ this.nodeFullTextIndexed = aggregate.hasNodeAggregates() ||
anyNodeScopeIndexedProperty();
this.propertyIndexEnabled = hasAnyPropertyIndexConfigured();
- this.indexesAllNodesOfMatchingType =
allMatchingNodeByTypeIndexed();
+ this.indexesAllNodesOfMatchingType =
areAlMatchingNodeByTypeIndexed();
this.nodeNameIndexed = getOptionalValue(config,
LuceneIndexConstants.INDEX_NODE_NAME, false);
validateRuleDefinition();
}
@@ -688,7 +690,8 @@ class IndexDefinition implements Aggrega
this.nodeScopeAnalyzedProps = original.nodeScopeAnalyzedProps;
this.aggregate = combine(propAggregate, nodeTypeName);
this.fulltextEnabled = aggregate.hasNodeAggregates() ||
original.fulltextEnabled;
- this.indexesAllNodesOfMatchingType =
allMatchingNodeByTypeIndexed();
+ this.nodeFullTextIndexed = aggregate.hasNodeAggregates() ||
original.nodeFullTextIndexed;
+ this.indexesAllNodesOfMatchingType =
areAlMatchingNodeByTypeIndexed();
this.nodeNameIndexed = original.nodeNameIndexed;
}
@@ -777,9 +780,22 @@ class IndexDefinition implements Aggrega
return nodeNameIndexed;
}
+ /**
+ * Returns true if the rule has any property definition which enables
+ * evaluation of fulltext related clauses
+ */
public boolean isFulltextEnabled() {
return fulltextEnabled;
}
+
+ /**
+ * Returns true if a fulltext field for the node would be created
+ * for any node matching the current rule.
+ */
+ public boolean isNodeFullTextIndexed() {
+ return nodeFullTextIndexed;
+ }
+
/**
* @param propertyName name of a property.
* @return the property configuration or <code>null</code> if this
@@ -910,10 +926,26 @@ class IndexDefinition implements Aggrega
return false;
}
- private boolean allMatchingNodeByTypeIndexed(){
- //Incase of fulltext all nodes matching this rule type would be
indexed
- //and would have entry in the index
- if (fulltextEnabled){
+ private boolean anyNodeScopeIndexedProperty(){
+ //Check if there is any nodeScope indexed property as
+ //for such case a node would always be indexed
+ for (PropertyDefinition pd : propConfigs.values()){
+ if (pd.nodeScopeIndex){
+ return true;
+ }
+ }
+
+ for (NamePattern np : namePatterns){
+ if (np.getConfig().nodeScopeIndex){
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private boolean areAlMatchingNodeByTypeIndexed(){
+ if (nodeFullTextIndexed){
return true;
}
@@ -1290,7 +1322,7 @@ class IndexDefinition implements Aggrega
private static boolean hasFulltextEnabledIndexRule(List<IndexingRule>
rules) {
for (IndexingRule rule : rules){
- if (rule.fulltextEnabled){
+ if (rule.isFulltextEnabled()){
return true;
}
}
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
Mon Nov 16 09:23:58 2015
@@ -268,6 +268,7 @@ class IndexPlanner {
final HashSet<String> relPaths = new HashSet<String>();
final HashSet<String> nonIndexedPaths = new HashSet<String>();
final AtomicBoolean relativeParentsFound = new AtomicBoolean();
+ final AtomicBoolean nodeScopedCondition = new AtomicBoolean();
ft.accept(new FullTextVisitor.FullTextVisitorBase() {
@Override
public boolean visit(FullTextContains contains) {
@@ -310,9 +311,17 @@ class IndexPlanner {
&& !indexingRule.isIndexed(propertyPath)){
nonIndexedPaths.add(p);
}
+
+ if (nodeScopedTerm(propertyName)){
+ nodeScopedCondition.set(true);
+ }
}
});
+ if (nodeScopedCondition.get() &&
!indexingRule.isNodeFullTextIndexed()){
+ return false;
+ }
+
if (relativeParentsFound.get()){
log.debug("Relative parents found {} which are not supported",
relPaths);
return false;
@@ -457,6 +466,14 @@ class IndexPlanner {
return false;
}
+ /**
+ * Determine if the propertyName of a fulltext term indicates current node
+ * @param propertyName property name in the full text term clause
+ */
+ private static boolean nodeScopedTerm(String propertyName) {
+ return propertyName == null || ".".equals(propertyName) ||
"*".equals(propertyName);
+ }
+
//~--------------------------------------------------------< PlanResult >
public static class PlanResult {
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
Mon Nov 16 09:23:58 2015
@@ -360,7 +360,7 @@ public class LuceneIndexEditor implement
//For property index no use making an empty document if
//none of the properties are indexed
- if(!indexingRule.isFulltextEnabled() && !dirty){
+ if(!indexingRule.indexesAllNodesOfMatchingType() && !dirty){
return null;
}
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
Mon Nov 16 09:23:58 2015
@@ -103,29 +103,29 @@ class PropertyDefinition {
//By default if a property is defined it is indexed
this.index = getOptionalValue(defn, LuceneIndexConstants.PROP_INDEX,
true);
- this.stored = getOptionalValue(defn,
LuceneIndexConstants.PROP_USE_IN_EXCERPT, false);
- this.nodeScopeIndex = getOptionalValue(defn,
LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, false);
+ this.stored = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_USE_IN_EXCERPT, false);
+ this.nodeScopeIndex = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, false);
//If boost is specified then that field MUST be analyzed
if (defn.hasProperty(FIELD_BOOST)){
this.analyzed = true;
} else {
- this.analyzed = getOptionalValue(defn,
LuceneIndexConstants.PROP_ANALYZED, false);
+ this.analyzed = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_ANALYZED, false);
}
//If node is not set for full text then a property definition
indicates that definition is for property index
- this.propertyIndex = getOptionalValue(defn,
LuceneIndexConstants.PROP_PROPERTY_INDEX, false);
- this.ordered = getOptionalValue(defn,
LuceneIndexConstants.PROP_ORDERED, false);
+ this.propertyIndex = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_PROPERTY_INDEX, false);
+ this.ordered = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_ORDERED, false);
this.includedPropertyTypes = IndexDefinition.getSupportedTypes(defn,
LuceneIndexConstants.PROP_INCLUDED_TYPE,
IndexDefinition.TYPES_ALLOW_ALL);
//TODO Add test case for above cases
this.propertyType = getPropertyType(idxDefn, nodeName, defn);
- this.useInSuggest = getOptionalValue(defn,
LuceneIndexConstants.PROP_USE_IN_SUGGEST, false);
- this.useInSpellcheck = getOptionalValue(defn,
LuceneIndexConstants.PROP_USE_IN_SPELLCHECK, false);
- this.nullCheckEnabled = getOptionalValue(defn,
LuceneIndexConstants.PROP_NULL_CHECK_ENABLED, false);
- this.notNullCheckEnabled = getOptionalValue(defn,
LuceneIndexConstants.PROP_NOT_NULL_CHECK_ENABLED, false);
+ this.useInSuggest = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_USE_IN_SUGGEST, false);
+ this.useInSpellcheck = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_USE_IN_SPELLCHECK, false);
+ this.nullCheckEnabled = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_NULL_CHECK_ENABLED, false);
+ this.notNullCheckEnabled = getOptionalValueIfIndexed(defn,
LuceneIndexConstants.PROP_NOT_NULL_CHECK_ENABLED, false);
this.nonRelativeName = determineNonRelativeName();
this.ancestors = computeAncestors(name);
validate();
@@ -201,6 +201,15 @@ class PropertyDefinition {
//~---------------------------------------------< internal >
+ private boolean getOptionalValueIfIndexed(NodeState definition, String
propName, boolean defaultVal){
+ //If property is not to be indexed then all other config would be
+ //set to false ignoring whatever is defined in config for them
+ if (!index){
+ return false;
+ }
+ return getOptionalValue(definition, propName, defaultVal);
+ }
+
private void validate() {
if (nullCheckEnabled && isRegexp){
throw new IllegalStateException(String.format("%s can be set to
true for property definition using " +
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Mon Nov 16 09:23:58 2015
@@ -682,6 +682,101 @@ public class IndexDefinitionTest {
assertEquals(2, rule1.getNodeScopeAnalyzedProps().size());
}
+ @Test
+ public void nodeFullTextIndexed_Regex() throws Exception {
+ NodeBuilder rules = builder.child(INDEX_RULES);
+ rules.child("nt:folder");
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NAME, ".*")
+ .setProperty(LuceneIndexConstants.PROP_ANALYZED, true)
+ .setProperty(LuceneIndexConstants.PROP_IS_REGEX, true);
+
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexingRule rule =
defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertNotNull(rule);
+ assertFalse(rule.isNodeFullTextIndexed());
+
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
+ defn = new IndexDefinition(root, builder.getNodeState());
+ rule = defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertTrue(rule.isNodeFullTextIndexed());
+ assertTrue(rule.indexesAllNodesOfMatchingType());
+ }
+
+ @Test
+ public void nodeFullTextIndexed_Simple() throws Exception {
+ NodeBuilder rules = builder.child(INDEX_RULES);
+ rules.child("nt:folder");
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NAME, "foo")
+ .setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexingRule rule =
defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertNotNull(rule);
+ assertFalse(rule.isNodeFullTextIndexed());
+
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true);
+ defn = new IndexDefinition(root, builder.getNodeState());
+ rule = defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertTrue(rule.isNodeFullTextIndexed());
+ assertTrue(rule.indexesAllNodesOfMatchingType());
+ }
+
+ @Test
+ public void nodeFullTextIndexed_Aggregates() throws Exception {
+ NodeBuilder rules = builder.child(INDEX_RULES);
+ rules.child("nt:folder");
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NAME, "foo")
+ .setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+
+ NodeBuilder aggregates =
builder.child(LuceneIndexConstants.AGGREGATES);
+ NodeBuilder aggFolder = aggregates.child("nt:folder");
+ aggFolder.child("i1").setProperty(LuceneIndexConstants.AGG_PATH, "*");
+
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexingRule rule =
defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertNotNull(rule);
+ assertTrue(rule.isNodeFullTextIndexed());
+ assertTrue(rule.indexesAllNodesOfMatchingType());
+ }
+
+ @Test
+ public void nonIndexPropShouldHaveAllOtherConfigDisabled() throws
Exception{
+ NodeBuilder rules = builder.child(INDEX_RULES);
+ rules.child("nt:folder");
+ TestUtil.child(rules, "nt:folder/properties/prop1")
+ .setProperty(LuceneIndexConstants.PROP_NAME, "foo")
+ .setProperty(LuceneIndexConstants.PROP_INDEX, false)
+ .setProperty(LuceneIndexConstants.PROP_USE_IN_SUGGEST, true)
+ .setProperty(LuceneIndexConstants.PROP_USE_IN_SPELLCHECK, true)
+ .setProperty(LuceneIndexConstants.PROP_NULL_CHECK_ENABLED,
true)
+ .setProperty(LuceneIndexConstants.PROP_NOT_NULL_CHECK_ENABLED,
true)
+ .setProperty(LuceneIndexConstants.PROP_USE_IN_EXCERPT, true)
+ .setProperty(LuceneIndexConstants.PROP_NODE_SCOPE_INDEX, true)
+ .setProperty(LuceneIndexConstants.PROP_ORDERED, true)
+ .setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+ IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState());
+ IndexingRule rule =
defn.getApplicableIndexingRule(newTree(newNode("nt:folder")));
+ assertNotNull(rule);
+
+ PropertyDefinition pd = rule.getConfig("foo");
+ //Assert that all other config is false if the index=false for any
property
+ assertFalse(pd.index);
+ assertFalse(pd.nodeScopeIndex);
+ assertFalse(pd.useInSuggest);
+ assertFalse(pd.useInSpellcheck);
+ assertFalse(pd.nullCheckEnabled);
+ assertFalse(pd.notNullCheckEnabled);
+ assertFalse(pd.stored);
+ assertFalse(pd.ordered);
+ assertFalse(pd.analyzed);
+
+ }
+
//TODO indexesAllNodesOfMatchingType - with nullCheckEnabled
private static IndexingRule getRule(IndexDefinition defn, String typeName){
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1714527&r1=1714526&r2=1714527&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
Mon Nov 16 09:23:58 2015
@@ -45,6 +45,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
+import org.junit.Ignore;
import org.junit.Test;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -402,6 +403,43 @@ public class IndexPlannerTest {
assertNotNull(planner.getPlan());
}
+ @Test
+ public void noPlanForFulltextQueryAndOnlyAnalyzedProperties() throws
Exception{
+ NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
+ defn.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true);
+
+ defn = IndexDefinition.updateDefinition(defn.getNodeState().builder());
+ NodeBuilder foob = getNode(defn, "indexRules/nt:base/properties/foo");
+ foob.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ FilterImpl filter = createFilter("nt:base");
+ filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
+ IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
+
+ QueryIndex.IndexPlan plan = planner.getPlan();
+ assertNull(plan);
+ }
+
+ @Test
+ public void noPlanForNodeTypeQueryAndOnlyAnalyzedProperties() throws
Exception{
+ NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
+ defn.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true);
+ defn.setProperty(IndexConstants.DECLARING_NODE_TYPES, of("nt:file"),
NAMES);
+
+ defn = IndexDefinition.updateDefinition(defn.getNodeState().builder());
+ NodeBuilder foob = getNode(defn, "indexRules/nt:file/properties/foo");
+ foob.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+
+ IndexNode node = createIndexNode(new IndexDefinition(root,
defn.getNodeState()));
+ FilterImpl filter = createFilter("nt:file");
+ filter.restrictPath("/foo", Filter.PathRestriction.ALL_CHILDREN);
+ IndexPlanner planner = new IndexPlanner(node, "/foo", filter,
Collections.<OrderEntry>emptyList());
+
+ QueryIndex.IndexPlan plan = planner.getPlan();
+ assertNull(plan);
+ }
+
private IndexNode createIndexNode(IndexDefinition defn, long numOfDocs)
throws IOException {
return new IndexNode("foo", defn, createSampleDirectory(numOfDocs));
}
