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 ca...@apache.org on 2019/06/13 15:37:52 UTC
svn commit: r1861270 - in /jackrabbit/oak/trunk:
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/
Author: catholicon
Date: Thu Jun 13 15:37:52 2019
New Revision: 1861270
URL: http://svn.apache.org/viewvc?rev=1861270&view=rev
Log:
OAK-8271: Lucene path transformed result doesn't accomodate wildcards in relative path
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1861270&r1=1861269&r2=1861270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Thu Jun 13 15:37:52 2019
@@ -893,7 +893,7 @@ public class IndexPlannerTest {
FulltextIndexPlanner.PlanResult pr = pr(plan);
assertTrue(pr.isPathTransformed());
assertEquals("/a/b", pr.transformPath("/a/b/jcr:content"));
- assertNull(pr.transformPath("/a/b/c"));
+ assertEquals("/a/b", pr.transformPath("/a/b/c"));
assertTrue(pr.hasProperty("jcr:content/foo"));
assertFalse(pr.hasProperty("bar"));
@@ -922,6 +922,30 @@ public class IndexPlannerTest {
}
@Test
+ public void relativeProperty_WithFulltext() throws Exception {
+ IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+ defnb.indexRule("nt:base").property("foo").propertyIndex();
+ defnb.indexRule("nt:base").property("bar").analyzed();
+
+ LuceneIndexDefinition defn = new LuceneIndexDefinition(root, defnb.build(), "/foo");
+ LuceneIndexNode node = createIndexNode(defn);
+
+ FilterImpl filter = createFilter("nt:base");
+ filter.restrictProperty("jcr:content/foo", Operator.EQUAL, PropertyValues.newString("/bar"));
+ filter.setFullTextConstraint(FullTextParser.parse("jcr:content/bar", "mountain"));
+
+ FulltextIndexPlanner planner = new FulltextIndexPlanner(node, "/foo", filter, Collections.<OrderEntry>emptyList());
+ QueryIndex.IndexPlan plan = planner.getPlan();
+ assertNotNull(plan);
+
+ FulltextIndexPlanner.PlanResult pr = pr(plan);
+ assertTrue(pr.isPathTransformed());
+ assertFalse(pr.evaluateNonFullTextConstraints());
+ assertEquals("/a/b", pr.transformPath("/a/b/jcr:content"));
+ assertNull(pr.transformPath("/a/b/c"));
+ }
+
+ @Test
public void relativeProperty_FullText() throws Exception{
IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
defnb.indexRule("nt:base").property("foo").propertyIndex();
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=1861270&r1=1861269&r2=1861270&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 Thu Jun 13 15:37:52 2019
@@ -3265,6 +3265,75 @@ public class LucenePropertyIndexTest ext
assertTrue("Injected def (" + defSeed + ")and clone (" + clonedSeed + " seeds aren't same", defSeed == clonedSeed);
}
+ @Test
+ public void pathTransformationWithWildcardInRelativePathFragment() throws Exception {
+ IndexDefinitionBuilder idxBuilder = new IndexDefinitionBuilder().noAsync();
+ idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
+ Tree idx = root.getTree("/").getChild("oak:index").addChild("fooIndex");
+ idxBuilder.build(idx);
+ root.commit();
+
+ Tree rootTree = root.getTree("/");
+ rootTree.addChild("a").addChild("j:c").addChild("foo1").setProperty("foo", "bar");
+ rootTree.addChild("b").addChild("j:c").addChild("foo2").setProperty("foo", "bar");
+ rootTree.addChild("c").addChild("j:c").setProperty("foo", "bar");
+ rootTree.addChild("d").addChild("e").addChild("j:c").addChild("foo3").setProperty("foo", "bar");
+ rootTree.addChild("j:c").addChild("foo4").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+ rootTree.addChild("foo5").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+ rootTree.addChild("f").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+ root.commit();
+
+ // XPaths
+ assertPlanAndQueryXPath("//*[j:c/*/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQueryXPath("//*[e/j:c/*/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+
+ assertPlanAndQueryXPath("//*[*/*/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQueryXPath("//*[*/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)",
+ asList("/a/j:c", "/b/j:c", "/c", "/d/e/j:c", "/j:c", "/"));
+
+ assertPlanAndQueryXPath("//*[j:c/*/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQueryXPath("//*[*/foo1/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a"));
+
+ assertPlanAndQueryXPath("//*[*/*/foo3/@foo = 'bar']",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+
+ // SQL2s
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [j:c/*/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [e/j:c/*/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [*/*/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [*/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)",
+ asList("/a/j:c", "/b/j:c", "/c", "/d/e/j:c", "/j:c", "/"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [j:c/*/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [*/foo1/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/a"));
+
+ assertPlanAndQuery("SELECT * FROM [nt:base] WHERE [*/*/foo3/foo] = 'bar'",
+ "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+ }
+
+ private void assertPlanAndQueryXPath(String query, String planExpectation, List<String> paths) throws ParseException {
+ assertXpathPlan(query, planExpectation);
+ assertQuery(query, XPATH, paths, false);
+ }
private void assertPlanAndQuery(String query, String planExpectation, List<String> paths) {
assertPlanAndQuery(query, planExpectation, paths, false);
}
Modified: jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java?rev=1861270&r1=1861269&r2=1861270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java (original)
+++ jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java Thu Jun 13 15:37:52 2019
@@ -1027,10 +1027,13 @@ public class FulltextIndexPlanner {
@Nullable
public String transformPath(String path){
if (isPathTransformed()){
- // get the base path
- // ensure the path ends with the given
- // relative path
- if (!path.endsWith(parentPathSegment)) {
+ // get the base path ensure the path ends with the given relative path
+ // for fulltext constraint.
+ // For non-fulltext constraint where query engine can evaluate the relative path
+ // condition, we shall take leeway and allow other features of query engine
+ // (like wildcard as a path element) get supported
+ if ( (!nonFullTextConstraints && !path.endsWith(parentPathSegment))
+ || (nonFullTextConstraints && getDepth(path) < parentDepth) ) {
return null;
}
return getAncestorPath(path, parentDepth);