Author: catholicon
Date: Thu Apr 7 02:08:00 2016
New Revision: 1738073
URL: http://svn.apache.org/viewvc?rev=1738073&view=rev
Log:
OAK-3838: IndexPlanner incorrectly lets all full text indices to participate
for suggest/spellcheck queries (backported r1723565 to 1.2 branch)
Index planner, for spellcheck and suggest queries, would now validate
selectNodeTypeName=indexRule.nodeTypeName and that at least one property in the
index need to supporting the features.
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
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/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 02:08:00 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,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,1678202,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,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695
420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,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,1707189,1707191,1707331,1707435,1707509,1708049,1708105,1708307,1708315,1708546,1708592,1
708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,172371
3,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725960,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732131,1732278,1734254,1735484,1735588,1737334,1737349
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,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,1678202,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,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695
420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,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,1707189,1707191,1707331,1707435,1707509,1708049,1708105,1708307,1708315,1708546,1708592,1
708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,172358
4,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725960,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732131,1732278,1734254,1735484,1735588,1737334,1737349
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1738073&r1=1738072&r2=1738073&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Thu Apr 7 02:08:00 2016
@@ -193,6 +193,10 @@ public class SelectorImpl extends Source
return selectorName;
}
+ public String getNodeType() {
+ return nodeTypeName;
+ }
+
public boolean matchesAllTypes() {
return matchesAllTypes;
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1738073&r1=1738072&r2=1738073&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
Thu Apr 7 02:08:00 2016
@@ -222,6 +222,14 @@ public class FilterImpl implements Filte
return selector;
}
+ @Override @Nullable
+ public String getNodeType() {
+ if (selector == null) {
+ return null;
+ }
+ return selector.getNodeType();
+ }
+
@Override
public boolean matchesAllTypes() {
return matchesAllTypes;
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java?rev=1738073&r1=1738072&r2=1738073&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
Thu Apr 7 02:08:00 2016
@@ -131,6 +131,14 @@ public interface Filter {
String getPathPlan();
/**
+ * Returns the name of the filter node type.
+ *
+ * @return nodetype name
+ */
+ @Nullable
+ String getNodeType();
+
+ /**
* Checks whether nodes of all types can match this filter.
*
* @return {@code true} iff there are no type restrictions
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=1738073&r1=1738072&r2=1738073&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
Thu Apr 7 02:08:00 2016
@@ -211,6 +211,10 @@ class IndexDefinition implements Aggrega
private final boolean suggestAnalyzed;
+ private final boolean suggestEnabled;
+
+ private final boolean spellcheckEnabled;
+
public IndexDefinition(NodeState root, NodeState defn) {
this(root, defn, null);
}
@@ -276,6 +280,8 @@ class IndexDefinition implements Aggrega
this.queryPaths = getQueryPaths(defn);
this.saveDirListing = getOptionalValue(defn,
LuceneIndexConstants.SAVE_DIR_LISTING, true);
this.suggestAnalyzed = getOptionalValue(defn,
LuceneIndexConstants.SUGGEST_ANALYZED, false);
+ this.suggestEnabled = evaluateSuggestionEnabled();
+ this.spellcheckEnabled = evaluateSpellcheckEnabled();
}
public boolean isFullTextEnabled() {
@@ -593,25 +599,46 @@ class IndexDefinition implements Aggrega
return ntBaseRule != null;
}
- public boolean isSuggestEnabled() {
- boolean suggestEnabled = false;
+ private boolean evaluateSuggestionEnabled() {
for (IndexingRule indexingRule : definedRules) {
for (PropertyDefinition propertyDefinition :
indexingRule.propConfigs.values()) {
if (propertyDefinition.useInSuggest) {
- suggestEnabled = true;
- break;
+ return true;
}
}
for (NamePattern np : indexingRule.namePatterns) {
if (np.getConfig().useInSuggest) {
- suggestEnabled = true;
- break;
+ return true;
}
}
}
+ return false;
+ }
+
+ public boolean isSuggestEnabled() {
return suggestEnabled;
}
+ private boolean evaluateSpellcheckEnabled() {
+ for (IndexingRule indexingRule : definedRules) {
+ for (PropertyDefinition propertyDefinition :
indexingRule.propConfigs.values()) {
+ if (propertyDefinition.useInSpellcheck) {
+ return true;
+ }
+ }
+ for (NamePattern np : indexingRule.namePatterns) {
+ if (np.getConfig().useInSpellcheck) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean isSpellcheckEnabled() {
+ return spellcheckEnabled;
+ }
+
@CheckForNull
public String getIndexPathFromConfig() {
return definition.getString(LuceneIndexConstants.INDEX_PATH);
@@ -724,6 +751,13 @@ class IndexDefinition implements Aggrega
return nodeTypeName;
}
+ /**
+ * @return name of the base node type.
+ */
+ public String getBaseNodeType() {
+ return baseNodeType;
+ }
+
public List<PropertyDefinition> getNullCheckEnabledProperties() {
return nullCheckEnabledProperties;
}
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=1738073&r1=1738072&r2=1738073&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
Thu Apr 7 02:08:00 2016
@@ -29,6 +29,8 @@ import javax.annotation.CheckForNull;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.PropertyValue;
+import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
import
org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition.IndexingRule;
import org.apache.jackrabbit.oak.query.fulltext.FullTextContains;
@@ -136,9 +138,7 @@ class IndexPlanner {
if (definition.hasFunctionDefined()
&& filter.getPropertyRestriction(definition.getFunctionName())
!= null) {
- //If native function is handled by this index then ensure
- // that lowest cost if returned
- return defaultPlan().setEstimatedEntryCount(1);
+ return
getNativeFunctionPlanBuilder(indexingRule.getBaseNodeType());
}
List<String> indexedProps =
newArrayListWithCapacity(filter.getPropertyRestrictions().size());
@@ -215,6 +215,31 @@ class IndexPlanner {
return null;
}
+ private IndexPlan.Builder getNativeFunctionPlanBuilder(String
indexingRuleBaseNodeType) {
+ boolean canHandleNativeFunction = true;
+
+ PropertyValue pv =
filter.getPropertyRestriction(definition.getFunctionName()).first;
+ String query = pv.getValue(Type.STRING);
+
+ if (query.startsWith("suggest?term=")) {
+ if (definition.isSuggestEnabled()) {
+ canHandleNativeFunction =
indexingRuleBaseNodeType.equals(filter.getNodeType());
+ } else {
+ canHandleNativeFunction = false;
+ }
+ } else if (query.startsWith("spellcheck?term=")) {
+ if (definition.isSpellcheckEnabled()) {
+ canHandleNativeFunction =
indexingRuleBaseNodeType.equals(filter.getNodeType());
+ } else {
+ canHandleNativeFunction = false;
+ }
+ }
+
+ //If native function can be handled by this index then ensure
+ // that lowest cost if returned
+ return canHandleNativeFunction ?
defaultPlan().setEstimatedEntryCount(1) : null;
+ }
+
/**
* Check if there is a mismatch between QueryPaths associated with index
* and path restriction specified in query
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=1738073&r1=1738072&r2=1738073&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
Thu Apr 7 02:08:00 2016
@@ -54,6 +54,7 @@ import static javax.jcr.PropertyType.TYP
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.PathFilter.PROP_INCLUDED_PATHS;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
@@ -459,6 +460,127 @@ public class IndexPlannerTest {
assertNull(plan);
}
+ //------ Suggestion/spellcheck plan tests
+ @Test
+ public void nonSuggestIndex() throws Exception {
+ //An index which doesn't define any property to support suggestions
shouldn't turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:base";
+ boolean enableSuggestionIndex = false;
+ boolean enableSpellcheckIndex = false;
+ boolean queryForSugggestion = true;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNull(plan);
+ }
+
+ @Test
+ public void nonSpellcheckIndex() throws Exception {
+ //An index which doesn't define any property to support spell check
shouldn't turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:base";
+ boolean enableSuggestionIndex = false;
+ boolean enableSpellcheckIndex = false;
+ boolean queryForSugggestion = false;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNull(plan);
+ }
+
+ @Test
+ public void simpleSuggestIndexPlan() throws Exception {
+ //An index defining a property for suggestions should turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:base";
+ boolean enableSuggestionIndex = true;
+ boolean enableSpellcheckIndex = false;
+ boolean queryForSugggestion = true;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNotNull(plan);
+ }
+
+ @Test
+ public void simpleSpellcheckIndexPlan() throws Exception {
+ //An index defining a property for spellcheck should turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:base";
+ boolean enableSuggestionIndex = false;
+ boolean enableSpellcheckIndex = true;
+ boolean queryForSugggestion = false;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNotNull(plan);
+ }
+
+ @Test
+ public void suggestionIndexingRuleHierarchy() throws Exception {
+ //An index defining a property for suggestion on a base type shouldn't
turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:unstructured";
+ boolean enableSuggestionIndex = true;
+ boolean enableSpellcheckIndex = false;
+ boolean queryForSugggestion = true;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNull(plan);
+ }
+
+ @Test
+ public void spellcheckIndexingRuleHierarchy() throws Exception {
+ //An index defining a property for spellcheck on a base type shouldn't
turn up in plan.
+ String indexNodeType = "nt:base";
+ String queryNodeType = "nt:unstructured";
+ boolean enableSuggestionIndex = false;
+ boolean enableSpellcheckIndex = true;
+ boolean queryForSugggestion = false;
+
+ IndexNode node = createSuggestionOrSpellcheckIndex(indexNodeType,
enableSuggestionIndex, enableSpellcheckIndex);
+ QueryIndex.IndexPlan plan = getSuggestOrSpellcheckIndexPlan(node,
queryNodeType, queryForSugggestion);
+
+ assertNull(plan);
+ }
+
+ private IndexNode createSuggestionOrSpellcheckIndex(String nodeType,
+ boolean
enableSuggestion,
+ boolean
enableSpellcheck) throws Exception {
+ NodeBuilder defn = newLucenePropertyIndexDefinition(builder, "test",
of("foo"), "async");
+ defn.setProperty(DECLARING_NODE_TYPES, nodeType);
+
+ defn = IndexDefinition.updateDefinition(defn.getNodeState().builder());
+ NodeBuilder foob = getNode(defn, "indexRules/" + nodeType +
"/properties/foo");
+ foob.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+ if (enableSuggestion) {
+ foob.setProperty(LuceneIndexConstants.PROP_USE_IN_SUGGEST, true);
+ } if (enableSpellcheck) {
+ foob.setProperty(LuceneIndexConstants.PROP_USE_IN_SPELLCHECK,
true);
+ }
+
+ IndexDefinition indexDefinition = new IndexDefinition(root,
defn.getNodeState());
+ return createIndexNode(indexDefinition);
+ }
+
+ private QueryIndex.IndexPlan getSuggestOrSpellcheckIndexPlan(IndexNode
indexNode, String nodeType,
+ boolean
forSugggestion) throws Exception {
+ FilterImpl filter = createFilter(nodeType);
+ filter.restrictProperty(indexNode.getDefinition().getFunctionName(),
Operator.EQUAL,
+
PropertyValues.newString((forSugggestion?"suggest":"spellcheck") +
"?term=foo"));
+ IndexPlanner planner = new IndexPlanner(indexNode, "/foo", filter,
Collections.<OrderEntry>emptyList());
+
+ return planner.getPlan();
+ }
+ //------ END - Suggestion/spellcheck plan tests
+
private IndexNode createIndexNode(IndexDefinition defn, long numOfDocs)
throws IOException {
return new IndexNode("foo", defn, createSampleDirectory(numOfDocs),
null);
}
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java?rev=1738073&r1=1738072&r2=1738073&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
Thu Apr 7 02:08:00 2016
@@ -201,7 +201,7 @@ public class LuceneIndexSuggestionTest {
final String indexPropName = "description";
final String indexPropValue = "this is just a sample text which should
get some response in suggestions";
final String suggestQueryText = "th";
- final boolean shouldSuggest = true;
+ final boolean shouldSuggest = false;
checkSuggestions(indexNodeType, queryNodeType,
indexPropName, indexPropValue,
