You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/09/01 14:00:27 UTC
svn commit: r1700506 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/jcr/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Tue Sep 1 12:00:26 2015
New Revision: 1700506
URL: http://svn.apache.org/r1700506
Log:
OAK-1752 - Node name queries should use an index
Adding nodeName support in LucenePropertyIndex
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.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/FieldNames.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java Tue Sep 1 12:00:26 2015
@@ -87,6 +87,11 @@ public final class FieldNames {
public static final String NOT_NULL_PROPS = ":notNullProps";
/**
+ * Name of the field that contains the node name
+ */
+ public static final String NODE_NAME = ":nodeName";
+
+ /**
* Used to select only the PATH field from the lucene documents
*/
public static final Set<String> PATH_SELECTOR = new HashSet<String>(
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Tue Sep 1 12:00:26 2015
@@ -625,6 +625,7 @@ class IndexDefinition implements Aggrega
private final List<PropertyDefinition> nullCheckEnabledProperties;
private final List<PropertyDefinition> notNullCheckEnabledProperties;
private final boolean indexesAllNodesOfMatchingType;
+ private final boolean nodeNameIndexed;
final float boost;
final boolean inherited;
@@ -657,6 +658,7 @@ class IndexDefinition implements Aggrega
this.fulltextEnabled = aggregate.hasNodeAggregates() || hasAnyFullTextEnabledProperty();
this.propertyIndexEnabled = hasAnyPropertyIndexConfigured();
this.indexesAllNodesOfMatchingType = allMatchingNodeByTypeIndexed();
+ this.nodeNameIndexed = getOptionalValue(config, LuceneIndexConstants.INDEX_NODE_NAME, false);
validateRuleDefinition();
}
@@ -682,6 +684,7 @@ class IndexDefinition implements Aggrega
this.aggregate = combine(propAggregate, nodeTypeName);
this.fulltextEnabled = aggregate.hasNodeAggregates() || original.fulltextEnabled;
this.indexesAllNodesOfMatchingType = allMatchingNodeByTypeIndexed();
+ this.nodeNameIndexed = original.nodeNameIndexed;
}
/**
@@ -755,6 +758,10 @@ class IndexDefinition implements Aggrega
}
+ public boolean isNodeNameIndexed() {
+ return nodeNameIndexed;
+ }
+
public boolean isFulltextEnabled() {
return fulltextEnabled;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Tue Sep 1 12:00:26 2015
@@ -164,6 +164,7 @@ class IndexPlanner {
boolean evalNodeTypeRestrictions = canEvalNodeTypeRestrictions(indexingRule);
boolean evalPathRestrictions = canEvalPathRestrictions(indexingRule);
boolean canEvalAlFullText = canEvalAllFullText(indexingRule, ft);
+ boolean canEvalNodeNameRestriction = canEvalNodeNameRestriction(indexingRule);
if (ft != null && !canEvalAlFullText){
return null;
@@ -173,7 +174,8 @@ class IndexPlanner {
List<OrderEntry> sortOrder = createSortOrder(indexingRule);
boolean canSort = canSortByProperty(sortOrder);
- if (!indexedProps.isEmpty() || canSort || ft != null || evalPathRestrictions || evalNodeTypeRestrictions) {
+ if (!indexedProps.isEmpty() || canSort || ft != null
+ || evalPathRestrictions || evalNodeTypeRestrictions || canEvalNodeNameRestriction) {
//TODO Need a way to have better cost estimate to indicate that
//this index can evaluate more propertyRestrictions natively (if more props are indexed)
//For now we reduce cost per entry
@@ -199,6 +201,10 @@ class IndexPlanner {
result.enableNodeTypeEvaluation();
}
+ if (canEvalNodeNameRestriction){
+ result.enableNodeNameRestriction();
+ }
+
return plan.setCostPerEntry(definition.getCostPerEntry() / costPerEntryFactor);
}
@@ -231,6 +237,14 @@ class IndexPlanner {
return false;
}
+ private boolean canEvalNodeNameRestriction(IndexingRule indexingRule) {
+ PropertyRestriction pr = filter.getPropertyRestriction(QueryConstants.RESTRICTION_LOCAL_NAME);
+ if (pr == null){
+ return false;
+ }
+ return indexingRule.isNodeNameIndexed();
+ }
+
private static boolean canSortByProperty(List<OrderEntry> sortOrder) {
if (sortOrder.isEmpty()) {
return false;
@@ -444,17 +458,6 @@ class IndexPlanner {
//Relative parent properties where [../foo1] is not null
return true;
}
- int usablePropertRestrictionCount = 0;
- for (PropertyRestriction pr : filter.getPropertyRestrictions()) {
- String name = pr.propertyName;
- if (QueryConstants.RESTRICTION_LOCAL_NAME.equals(name)) {
- continue;
- }
- usablePropertRestrictionCount++;
- }
- if (usablePropertRestrictionCount == 0) {
- return true;
- }
return false;
}
@@ -472,6 +475,7 @@ class IndexPlanner {
private String parentPathSegment;
private boolean relativize;
private boolean nodeTypeRestrictions;
+ private boolean nodeNameRestriction;
public PlanResult(String indexPath, IndexDefinition defn, IndexingRule indexingRule) {
this.indexPath = indexPath;
@@ -521,6 +525,8 @@ class IndexPlanner {
return nodeTypeRestrictions;
}
+ public boolean evaluateNodeNameRestriction() {return nodeNameRestriction;}
+
private void setParentPath(String relativePath){
parentPathSegment = "/" + relativePath;
if (relativePath.isEmpty()){
@@ -540,5 +546,9 @@ class IndexPlanner {
private void enableNodeTypeEvaluation() {
nodeTypeRestrictions = true;
}
+
+ private void enableNodeNameRestriction(){
+ nodeNameRestriction = true;
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Tue Sep 1 12:00:26 2015
@@ -257,6 +257,12 @@ public interface LuceneIndexConstants {
String PROP_NOT_NULL_CHECK_ENABLED = "notNullCheckEnabled";
/**
+ * IndexRule level config to indicate that Node name should also be index
+ * to support fn:name() queries
+ */
+ String INDEX_NODE_NAME = "indexNodeName";
+
+ /**
* Boolean property indicating that Lucene directory content
* should be saved as part of NodeState itself as a multi value property
* to allow faster reads (OAK-2809)
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Tue Sep 1 12:00:26 2015
@@ -352,6 +352,12 @@ public class LuceneIndexEditor implement
return null;
}
+ String name = getName(path);
+ if (indexingRule.isNodeNameIndexed()){
+ addNodeNameField(fields, name);
+ dirty = true;
+ }
+
//For property index no use making an empty document if
//none of the properties are indexed
if(!indexingRule.isFulltextEnabled() && !dirty){
@@ -360,9 +366,8 @@ public class LuceneIndexEditor implement
Document document = new Document();
document.add(newPathField(path));
- String name = getName(path);
- //TODO Possibly index nodeName without tokenization for node name based queries
+
if (indexingRule.isFulltextEnabled()) {
document.add(newFulltextField(name));
}
@@ -892,4 +897,21 @@ public class LuceneIndexEditor implement
return context.getDefinition().getIndexName();
}
+
+ /**
+ * Extracts the local name of the current node ignoring any namespace prefix
+ *
+ * @param name node name
+ */
+ private static void addNodeNameField(List<Field> fields, String name) {
+ //TODO Need to check if it covers all cases
+ int colon = name.indexOf(':');
+ String value = colon < 0 ? name : name.substring(colon + 1);
+
+ //For now just add a single term. Later we can look into using different analyzer
+ //to analyze the node name and add multiple terms. Like add multiple terms for a
+ //cameCase file name to allow faster like search
+ fields.add(new StringField(FieldNames.NODE_NAME, value, Field.Store.NO));
+ }
+
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Tue Sep 1 12:00:26 2015
@@ -725,7 +725,14 @@ public class LucenePropertyIndex impleme
if ("rep:excerpt".equals(name)) {
continue;
}
+
if (QueryConstants.RESTRICTION_LOCAL_NAME.equals(name)) {
+ if (planResult.evaluateNodeNameRestriction()) {
+ Query q = createNodeNameQuery(pr);
+ if (q != null) {
+ qs.add(q);
+ }
+ }
continue;
}
@@ -956,6 +963,21 @@ public class LucenePropertyIndex impleme
return -1;
}
+ private static Query createNodeNameQuery(PropertyRestriction pr) {
+ String first = pr.first != null ? pr.first.getValue(STRING) : null;
+ if (pr.first != null && pr.first.equals(pr.last) && pr.firstIncluding
+ && pr.lastIncluding) {
+ // [property]=[value]
+ return new TermQuery(new Term(FieldNames.NODE_NAME, first));
+ }
+
+ if (pr.isLike) {
+ return createLikeQuery(FieldNames.NODE_NAME, first);
+ }
+
+ throw new IllegalStateException("For nodeName queries only EQUALS and LIKE are supported "+pr);
+ }
+
private static void addReferenceConstraint(String uuid, List<Query> qs,
IndexReader reader) {
if (reader == null) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java Tue Sep 1 12:00:26 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.2.0")
+@Version("2.3.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.plugins.index.lucene;
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java Tue Sep 1 12:00:26 2015
@@ -88,9 +88,12 @@ public class LuceneOakRepositoryStub ext
.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true)
.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES, 10);
- NodeBuilder props = index.child(LuceneIndexConstants.INDEX_RULES)
- .child("nt:base")
- .child(LuceneIndexConstants.PROP_NODE);
+ NodeBuilder ntBase = index.child(LuceneIndexConstants.INDEX_RULES)
+ .child("nt:base");
+
+ //Enable nodeName index support
+ ntBase.setProperty(LuceneIndexConstants.INDEX_NODE_NAME, true);
+ NodeBuilder props = ntBase.child(LuceneIndexConstants.PROP_NODE);
enableFulltextIndex(props.child("allProps"));
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Tue Sep 1 12:00:26 2015
@@ -64,6 +64,7 @@ public class LuceneIndexQueryTest extend
indexDefn.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true);
Tree props = TestUtil.newRulePropTree(indexDefn, "nt:base");
+ props.getParent().setProperty(LuceneIndexConstants.INDEX_NODE_NAME, true);
TestUtil.enablePropertyIndex(props, "c1/p", false);
TestUtil.enableForFullText(props, LuceneIndexConstants.REGEX_ALL_PROPS, true);
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1700506&r1=1700505&r2=1700506&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Tue Sep 1 12:00:26 2015
@@ -41,6 +41,7 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.fail;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
+import static org.apache.jackrabbit.JcrConstants.NT_FILE;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.ANALYZERS;
@@ -89,6 +90,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
+import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -502,6 +504,38 @@ public class LuceneIndexTest {
assertFilter(filter, queryIndex, indexed, ImmutableList.of("/a/b", "/a/b/c"));
}
+ @Test
+ public void nodeNameIndex() throws Exception{
+ NodeBuilder index = newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "lucene", ImmutableSet.of("foo"), null);
+ NodeBuilder rules = index.child(INDEX_RULES);
+ NodeBuilder ruleNode = rules.child(NT_FILE);
+ ruleNode.setProperty(LuceneIndexConstants.INDEX_NODE_NAME, true);
+
+ NodeState before = builder.getNodeState();
+ createNodeWithType(builder, "foo", NT_FILE);
+ createNodeWithType(builder, "camelCase", NT_FILE);
+ NodeState after = builder.getNodeState();
+
+ NodeState indexed = HOOK.processCommit(before, after,CommitInfo.EMPTY);
+
+ IndexTracker tracker = new IndexTracker();
+ tracker.update(indexed);
+ AdvancedQueryIndex queryIndex = new LucenePropertyIndex(tracker);
+
+ FilterImpl filter = createFilter(NT_FILE);
+ filter.restrictProperty(QueryConstants.RESTRICTION_LOCAL_NAME, Operator.EQUAL, PropertyValues.newString("foo"));
+ assertFilter(filter, queryIndex, indexed, ImmutableList.of("/foo"));
+
+ filter = createFilter(NT_FILE);
+ filter.restrictProperty(QueryConstants.RESTRICTION_LOCAL_NAME, Operator.LIKE, PropertyValues.newString("camelCase"));
+ assertFilter(filter, queryIndex, indexed, ImmutableList.of("/camelCase"));
+
+ filter = createFilter(NT_FILE);
+ filter.restrictProperty(QueryConstants.RESTRICTION_LOCAL_NAME, Operator.LIKE, PropertyValues.newString("camel%"));
+ assertFilter(filter, queryIndex, indexed, ImmutableList.of("/camelCase"));
+ }
+
private FilterImpl createTestFilter(){
FilterImpl filter = createFilter(NT_BASE);
filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar"));
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=1700506&r1=1700505&r2=1700506&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 Tue Sep 1 12:00:26 2015
@@ -374,6 +374,33 @@ public class LucenePropertyIndexTest ext
}
@Test
+ public void nodeName() throws Exception{
+ Tree idx = createIndex("test1", of("propa", "propb"));
+ Tree rules = idx.addChild(LuceneIndexConstants.INDEX_RULES);
+ rules.setOrderableChildren(true);
+ Tree rule = rules.addChild("nt:base");
+ rule.setProperty(LuceneIndexConstants.INDEX_NODE_NAME, true);
+ root.commit();
+
+ Tree test = root.getTree("/");
+ test.addChild("foo");
+ test.addChild("camelCase");
+ test.addChild("test").addChild("bar");
+ root.commit();
+
+ String propabQuery = "select [jcr:path] from [nt:base] where LOCALNAME() = 'foo'";
+ assertThat(explain(propabQuery), containsString("lucene:test1(/oak:index/test1) :nodeName:foo"));
+ assertQuery(propabQuery, asList("/foo"));
+ assertQuery("select [jcr:path] from [nt:base] where LOCALNAME() = 'bar'", asList("/test/bar"));
+ assertQuery("select [jcr:path] from [nt:base] where LOCALNAME() LIKE 'foo'", asList("/foo"));
+ assertQuery("select [jcr:path] from [nt:base] where LOCALNAME() LIKE 'camel%'", asList("/camelCase"));
+
+ assertQuery("select [jcr:path] from [nt:base] where NAME() = 'bar'", asList("/test/bar"));
+ assertQuery("select [jcr:path] from [nt:base] where NAME() LIKE 'foo'", asList("/foo"));
+ assertQuery("select [jcr:path] from [nt:base] where NAME() LIKE 'camel%'", asList("/camelCase"));
+ }
+
+ @Test
public void emptyIndex() throws Exception{
Tree idx = createIndex("test1", of("propa", "propb"));
idx.addChild(PROP_NODE).addChild("propa");