Author: catholicon
Date: Wed May 11 14:01:36 2016
New Revision: 1743368
URL: http://svn.apache.org/viewvc?rev=1743368&view=rev
Log:
OAK-4351: Non-root lucene index throws exception if query constraints match
root of sub-tree
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.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/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=1743368&r1=1743367&r2=1743368&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
Wed May 11 14:01:36 2016
@@ -1528,6 +1528,8 @@ public class LucenePropertyIndex impleme
String sub = pathRow.getPath();
if (isVirtualRow()) {
return sub;
+ } else if (!"".equals(pathPrefix) &&
PathUtils.denotesRoot(sub)) {
+ return pathPrefix;
} else if (PathUtils.isAbsolute(sub)) {
return pathPrefix + sub;
} else {
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=1743368&r1=1743367&r2=1743368&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
Wed May 11 14:01:36 2016
@@ -926,6 +926,22 @@ public class LucenePropertyIndexTest ext
assertQuery("select [jcr:path] from [nt:base] as s where
ISDESCENDANTNODE(s, '/test/test2') and propa = 'a'",
asList("/test/test2/test3/a"));
}
+
+ @Test
+ public void indexDefinitionBelowRoot3() throws Exception {
+ Tree parent = root.getTree("/").addChild("test");
+ Tree idx = createIndex(parent, "test1", of("propa"));
+ idx.addChild(PROP_NODE).addChild("propa");
+ root.commit();
+
+ parent.setProperty("propa", "a");
+ parent.addChild("test1").setProperty("propa", "a");
+ root.commit();
+
+ //asert that (1) result gets returned correctly, (2) parent isn't
there, and (3) child is returned
+ assertQuery("select [jcr:path] from [nt:base] as s where
ISDESCENDANTNODE(s, '/test') and propa = 'a'", asList("/test/test1"));
+ }
+
@Test
public void sortQueriesWithLong() throws Exception {
Tree idx = createIndex("test1", of("foo", "bar"));
