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 12:12:25 UTC
svn commit: r1847251 - in /jackrabbit/oak/branches/1.6: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Author: catholicon
Date: Fri Nov 23 12:12:25 2018
New Revision: 1847251
URL: http://svn.apache.org/viewvc?rev=1847251&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.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 23 12:12:25 2018
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.8:1844835
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119
,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1814475,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832258,1832379,1832535,1833308,1834112,1834648-1834649,1834681,1835060,1836082,1837475,1837998,1838637,1839746,1840024,1840
226,1842677,1843175,1843222,1843231,1844549,1844642,1844728,1845730,1846057
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119
,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1814475,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832258,1832379,1832535,1833308,1834112,1834648-1834649,1834681,1835060,1836082,1837475,1837998,1838637,1839746,1840024,1840
226,1842677,1843175,1843222,1843231,1844549,1844642,1844728,1845730-1845731,1846057
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java?rev=1847251&r1=1847250&r2=1847251&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java Fri Nov 23 12:12:25 2018
@@ -46,6 +46,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.query.QueryImpl.REP_FACET;
/**
* This utility class provides factory methods to create commonly used types of
@@ -247,6 +248,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 (filter.isAlwaysFalse()) {
// nothing can match this filter, leave nodes empty
return;
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1847251&r1=1847250&r2=1847251&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Fri Nov 23 12:12:25 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");
@@ -713,6 +690,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");