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/26 13:36:29 UTC
svn commit: r1862138 - in /jackrabbit/oak/branches/1.10: ./
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: Wed Jun 26 13:36:29 2019
New Revision: 1862138
URL: http://svn.apache.org/viewvc?rev=1862138&view=rev
Log:
OAK-8271: Lucene path transformed result doesn't accomodate wildcards in relative path (backport r1861270 from trunk)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
jackrabbit/oak/branches/1.10/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 26 13:36:29 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859359,1859533,1859609,1859612,1859619,1859711,1859716,1859772,1859776,1859780,1859843,1859854,1859881
,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1861626,1862044
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857627,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859020,1859231,1859292,1859294,1859359,1859533,1859609,1859612,1859619,1859711,1859716,1859772,1859776,1859780,1859843,1859854,1859881
,1860120,1860131,1860137,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565,1861270,1861626,1862044
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1862138&r1=1862137&r2=1862138&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Wed Jun 26 13:36:29 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/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1862138&r1=1862137&r2=1862138&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java Wed Jun 26 13:36:29 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/branches/1.10/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java?rev=1862138&r1=1862137&r2=1862138&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java (original)
+++ jackrabbit/oak/branches/1.10/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java Wed Jun 26 13:36:29 2019
@@ -992,10 +992,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);