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:56:45 UTC
svn commit: r1862141 - in /jackrabbit/oak/branches/1.8: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: catholicon
Date: Wed Jun 26 13:56:44 2019
New Revision: 1862141
URL: http://svn.apache.org/viewvc?rev=1862141&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.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 26 13:56:44 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861270,1
861626
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1862141&r1=1862140&r2=1862141&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Wed Jun 26 13:56:44 2019
@@ -961,10 +961,13 @@ class IndexPlanner {
@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);
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1862141&r1=1862140&r2=1862141&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Wed Jun 26 13:56:44 2019
@@ -889,7 +889,7 @@ public class IndexPlannerTest {
IndexPlanner.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"));
@@ -918,6 +918,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();
+
+ IndexDefinition defn = new IndexDefinition(root, defnb.build(), "/foo");
+ IndexNode 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"));
+
+ IndexPlanner planner = new IndexPlanner(node, "/foo", filter, Collections.<OrderEntry>emptyList());
+ QueryIndex.IndexPlan plan = planner.getPlan();
+ assertNotNull(plan);
+
+ IndexPlanner.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.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1862141&r1=1862140&r2=1862141&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java Wed Jun 26 13:56:44 2019
@@ -2975,6 +2975,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);
}
@@ -3026,6 +3095,10 @@ public class LucenePropertyIndexTest ext
//TODO Test for range with Date. Check for precision
+ private void assertXpathPlan(String query, String planExpectation) throws ParseException {
+ assertThat(explainXpath(query), containsString(planExpectation));
+ }
+
private String explain(String query){
String explain = "explain " + query;
return executeQuery(explain, "JCR-SQL2").get(0);