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 2018/11/23 09:15:04 UTC
svn commit: r1847227 - in /jackrabbit/oak/branches/1.8: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Author: catholicon
Date: Fri Nov 23 09:15:03 2018
New Revision: 1847227
URL: http://svn.apache.org/viewvc?rev=1847227&view=rev
Log:
OAK-7608: Throw exception if all properties name are given wrong for faceting (backport r1845731 from trunk)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 23 09:15:03 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/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,1822201,1822207,1822527,1822642,1822723,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,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,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,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730,1846057
+/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,1822201,1822207,1822527,1822642,1822723,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,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,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,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1846057
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java?rev=1847227&r1=1847226&r2=1847227&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java Fri Nov 23 09:15:03 2018
@@ -48,6 +48,7 @@ import com.google.common.collect.Queues;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
+import static org.apache.jackrabbit.oak.spi.query.QueryConstants.REP_FACET;
/**
* This utility class provides factory methods to create commonly used types of
@@ -262,6 +263,12 @@ public class Cursors {
return;
}
+ Filter.PropertyRestriction facetRestriction = filter.getPropertyRestriction(REP_FACET);
+ if (facetRestriction != null) {
+ // we don't evaluate facets by traversal
+ throw new IllegalArgumentException(facetRestriction + " can't be evaluated by traversal");
+ }
+
if (!path.equals("/")) {
for (String name : path.substring(1).split("/")) {
parentPath = currentPath;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1847227&r1=1847226&r2=1847227&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Fri Nov 23 09:15:03 2018
@@ -105,29 +105,6 @@ public class FacetTest extends AbstractQ
super.tearDown();
}
- public void testFacetsNA() throws Exception {
- if (superuser.itemExists(FACET_CONFING_PROP_PATH)) {
- superuser.getItem(FACET_CONFING_PROP_PATH).remove();
- markIndexForReindex();
- superuser.save();
- }
- Session session = superuser;
- QueryManager qm = session.getWorkspace().getQueryManager();
- Node n1 = testRootNode.addNode("node1");
- n1.setProperty("text", "foo");
- Node n2 = testRootNode.addNode("node2");
- n2.setProperty("text", "bar");
- session.save();
-
- String sql2 = "select [jcr:path], [rep:facet(text)] from [nt:base] " +
- "where contains([text], 'foo OR bar')";
- Query q = qm.createQuery(sql2, Query.JCR_SQL2);
- QueryResult result = q.execute();
- FacetResult facetResult = new FacetResult(result);
- assertNotNull(facetResult);
- assertTrue(facetResult.getDimensions().isEmpty());
- }
-
public void testFacetRetrieval() throws Exception {
Session session = superuser;
Node n1 = testRootNode.addNode("node1");
@@ -711,6 +688,55 @@ public class FacetTest extends AbstractQ
assertEquals("Unexpected facet count", 1, facet.getCount());
}
+ public void testNoIndexedFacetedQuery() throws Exception {
+ Query q = qm.createQuery("//*[@jcr:title]/(rep:facet(non-indexed/jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+
+ try {
+ new FacetResult(result);
+
+ fail("Facet evaluation must fail if the index doesn't support the required faceted properties");
+ } catch (RuntimeException iae) {
+ if (iae.getCause() instanceof IllegalArgumentException) {
+ // expected and hence ignored
+ } else {
+ throw iae;
+ }
+ }
+
+ q = qm.createQuery("//*[@jcr:title]/(rep:facet(non-indexed1/jcr:title) | rep:facet(non-indexed2/jcr:title))", Query.XPATH);
+ result = q.execute();
+
+ try {
+ new FacetResult(result);
+
+ fail("Facet evaluation must fail if the index doesn't support any of the required faceted properties");
+ } catch (RuntimeException iae) {
+ if (iae.getCause() instanceof IllegalArgumentException) {
+ // expected and hence ignored
+ } else {
+ throw iae;
+ }
+ }
+ }
+
+ public void testSomeNonIndexedFacetedQuery() throws Exception {
+ Query q = qm.createQuery("//*[@jcr:title]/(rep:facet(non-indexed/jcr:title) | rep:facet(jcr:title))", Query.XPATH);
+ QueryResult result = q.execute();
+
+ try {
+ new FacetResult(result);
+
+ fail("Facet evaluation must fail if the index doesn't support some of the required faceted properties");
+ } catch (RuntimeException iae) {
+ if (iae.getCause() instanceof IllegalArgumentException) {
+ // expected and hence ignored
+ } else {
+ throw iae;
+ }
+ }
+ }
+
public void testAcRelativeFacetsAccessControl() throws Exception {
deny(testRootNode.addNode("test1")).addNode("jc").setProperty("text", "test_1");
deny(testRootNode.addNode("test2").addNode("jc")).setProperty("text", "test_2");