Author: catholicon
Date: Sun Nov 5 03:45:46 2017
New Revision: 1814334
URL: http://svn.apache.org/viewvc?rev=1814334&view=rev
Log:
OAK-6750: Lucene facets don't work with relative properties (backport from
trunk)
OAK-6792: rep:facet not supported in xpath (backport to trunk)
Backporting r1811380, r1811952, r1811963, r1811986 and r1814332 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
jackrabbit/oak/branches/1.4/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 5 03:45:46 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.6:1802566
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772
768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811655,1814189
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772
768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811655,1811952,1811963,1811986,1814189,1814332
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 5 03:45:46 2017
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/branches/1.6/oak-core:1802566
-/jackrabbit/oak/trunk/oak-core:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-175007
7,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,177
2593,1772768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163
+/jackrabbit/oak/trunk/oak-core:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-175007
7,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,177
2593,1772768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811952,1811963,1811986,1814332
/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1814334&r1=1814333&r2=1814334&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Sun Nov 5 03:45:46 2017
@@ -631,7 +631,8 @@ public class SelectorImpl extends Source
PropertyState s = builder.getPropertyState();
return PropertyValues.create(s);
}
- boolean relative = oakPropertyName.indexOf('/') >= 0;
+ boolean relative = !oakPropertyName.startsWith(QueryImpl.REP_FACET +
"(")
+ && oakPropertyName.indexOf('/') >= 0;
Tree t = currentTree();
if (relative) {
for (String p :
PathUtils.elements(PathUtils.getParentPath(oakPropertyName))) {
@@ -666,7 +667,7 @@ public class SelectorImpl extends Source
result = PropertyValues.newString(local);
} else if (oakPropertyName.equals(QueryImpl.JCR_SCORE)) {
result = currentRow.getValue(QueryImpl.JCR_SCORE);
- } else if (oakPropertyName.equals(QueryImpl.REP_EXCERPT)) {
+ } else if (oakPropertyName.equals(QueryImpl.REP_EXCERPT + "(")) {
result = currentRow.getValue(QueryImpl.REP_EXCERPT);
} else if (oakPropertyName.equals(QueryImpl.OAK_SCORE_EXPLANATION)) {
result = currentRow.getValue(QueryImpl.OAK_SCORE_EXPLANATION);
@@ -674,7 +675,7 @@ public class SelectorImpl extends Source
result = currentRow.getValue(QueryImpl.REP_SPELLCHECK);
} else if (oakPropertyName.equals(QueryImpl.REP_SUGGEST)) {
result = currentRow.getValue(QueryImpl.REP_SUGGEST);
- } else if (oakPropertyName.startsWith(QueryImpl.REP_FACET)) {
+ } else if (oakPropertyName.startsWith(QueryImpl.REP_FACET + "(")) {
result = currentRow.getValue(oakPropertyName);
} else {
result = PropertyValues.create(t.getProperty(oakPropertyName));
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java?rev=1814334&r1=1814333&r2=1814334&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
Sun Nov 5 03:45:46 2017
@@ -247,6 +247,21 @@ public class XPathToSQL2Converter {
readOpenDotClose(true);
Expression.Property p = new
Expression.Property(currentSelector, "rep:suggest()", false);
statement.addSelectColumn(p);
+ } else if (readIf("rep:facet")) {
+ // this will also deal with relative properties
+ // (functions and so on are also working, but this is
probably not needed)
+ read("(");
+ Expression e = parseExpression();
+ if (!(e instanceof Expression.Property)) {
+ throw getSyntaxError();
+ }
+ Expression.Property prop = (Expression.Property) e;
+ String property = prop.getColumnAliasName();
+ read(")");
+ rewindSelector();
+ Expression.Property p = new
Expression.Property(currentSelector,
+ "rep:facet(" + property + ")", false);
+ statement.addSelectColumn(p);
}
} while (readIf("|"));
read(")");
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt?rev=1814334&r1=1814333&r2=1814334&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
Sun Nov 5 03:45:46 2017
@@ -24,6 +24,21 @@
# * new tests are typically be added on top, after the syntax docs
# * use ascii character only
+# OAK-6792
+
+xpath2sql /jcr:root//*/(rep:facet(jcr:data/jcr:createdBy))
+select [jcr:path], [jcr:score], [rep:facet(jcr:data/jcr:createdBy)]
+ from [nt:base] as a
+ where isdescendantnode(a, '/')
+ /* xpath ... */
+
+
+xpath2sql /jcr:root//*/(rep:facet(jcr:createdBy))
+select [jcr:path], [jcr:score], [rep:facet(jcr:createdBy)]
+ from [nt:base] as a
+ where isdescendantnode(a, '/')
+ /* xpath ... */
+
# OAK-5949
xpath2sql
/jcr:root/home//element(*,rep:Authorizable)[jcr:like(@rep:authorizableId,'@')]
Modified:
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1814334&r1=1814333&r2=1814334&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Sun Nov 5 03:45:46 2017
@@ -45,15 +45,26 @@ public class FacetTest extends AbstractQ
@Before
protected void setUp() throws Exception {
super.setUp();
- if (!superuser.itemExists(FACET_CONFING_PROP_PATH)) {
- Node node =
superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties/allProps");
- node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
- superuser.save();
- superuser.refresh(true);
+ if (superuser.itemExists(FACET_CONFING_PROP_PATH)) {
+ superuser.getItem(FACET_CONFING_PROP_PATH).remove();
}
+ Node props =
superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties");
+ if (props.hasNode("relative")) {
+ props.getNode("relative").remove();
+ }
+
+ Node node = props.addNode("relative");
+ node.setProperty("name", "jc/text");
+ node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
+ node.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+ node = props.getNode("allProps");
+ node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
+ superuser.save();
+ superuser.refresh(true);
+
if (!superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
- Node node = superuser.getNode(INDEX_CONFING_NODE_PATH);
+ node = superuser.getNode(INDEX_CONFING_NODE_PATH);
node.addNode(LuceneIndexConstants.FACETS);
superuser.save();
superuser.refresh(true);
@@ -70,6 +81,12 @@ public class FacetTest extends AbstractQ
superuser.refresh(true);
}
+ if
(superuser.nodeExists("/oak:index/luceneGlobal/indexRules/nt:base/properties/relative"))
{
+
superuser.removeItem("/oak:index/luceneGlobal/indexRules/nt:base/properties/relative");
+ superuser.save();
+ superuser.refresh(true);
+ }
+
if (superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
superuser.getNode(FACET_CONFING_NODE_PATH).remove();
superuser.save();
@@ -124,6 +141,121 @@ public class FacetTest extends AbstractQ
assertNotNull(facets);
assertEquals("hallo", facets.get(0).getLabel());
assertEquals(1, facets.get(0).getCount(), 0);
+ assertEquals("hello", facets.get(1).getLabel());
+ assertEquals(1, facets.get(1).getCount(), 0);
+ assertEquals("oh hallo", facets.get(2).getLabel());
+ assertEquals(1, facets.get(2).getCount(), 0);
+
+ NodeIterator nodes = result.getNodes();
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertFalse(nodes.hasNext());
+ }
+
+ public void testFacetRetrievalXPath() throws Exception {
+ Session session = superuser;
+ Node n1 = testRootNode.addNode("node1");
+ n1.setProperty("text", "hello");
+ Node n2 = testRootNode.addNode("node2");
+ n2.setProperty("text", "hallo");
+ Node n3 = testRootNode.addNode("node3");
+ n3.setProperty("text", "oh hallo");
+ session.save();
+
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ String xpath = "//*[jcr:contains(@text, 'hello OR
hallo')]/(rep:facet(text)) order by jcr:path";
+ Query q = qm.createQuery(xpath, Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+ assertNotNull(facetResult);
+ assertNotNull(facetResult.getDimensions());
+ assertEquals(1, facetResult.getDimensions().size());
+ assertTrue(facetResult.getDimensions().contains("text"));
+ List<FacetResult.Facet> facets = facetResult.getFacets("text");
+ assertNotNull(facets);
+ assertEquals("hallo", facets.get(0).getLabel());
+ assertEquals(1, facets.get(0).getCount(), 0);
+ assertEquals("hello", facets.get(1).getLabel());
+ assertEquals(1, facets.get(1).getCount(), 0);
+ assertEquals("oh hallo", facets.get(2).getLabel());
+ assertEquals(1, facets.get(2).getCount(), 0);
+
+ NodeIterator nodes = result.getNodes();
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertFalse(nodes.hasNext());
+ }
+
+ public void testFacetRetrievalRelativeProperty() throws Exception {
+ Session session = superuser;
+ Node n1 = testRootNode.addNode("node1");
+ n1.addNode("jc").setProperty("text", "hello");
+ Node n2 = testRootNode.addNode("node2");
+ n2.addNode("jc").setProperty("text", "hallo");
+ Node n3 = testRootNode.addNode("node3");
+ n3.addNode("jc").setProperty("text", "oh hallo");
+ session.save();
+
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ String sql2 = "select [jcr:path], [rep:facet(jc/text)] from [nt:base]
" +
+ "where contains([jc/text], 'hello OR hallo') order by
[jcr:path]";
+ Query q = qm.createQuery(sql2, Query.JCR_SQL2);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+ assertNotNull(facetResult);
+ assertNotNull(facetResult.getDimensions());
+ assertEquals(1, facetResult.getDimensions().size());
+ assertTrue(facetResult.getDimensions().contains("jc/text"));
+ List<FacetResult.Facet> facets = facetResult.getFacets("jc/text");
+ assertNotNull(facets);
+ assertEquals("hallo", facets.get(0).getLabel());
+ assertEquals(1, facets.get(0).getCount(), 0);
+ assertEquals("hello", facets.get(1).getLabel());
+ assertEquals(1, facets.get(1).getCount(), 0);
+ assertEquals("oh hallo", facets.get(2).getLabel());
+ assertEquals(1, facets.get(2).getCount(), 0);
+
+ NodeIterator nodes = result.getNodes();
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertTrue(nodes.hasNext());
+ assertNotNull(nodes.nextNode());
+ assertFalse(nodes.hasNext());
+ }
+
+ public void testFacetRetrievalRelativePropertyXPath() throws Exception {
+ Session session = superuser;
+ Node n1 = testRootNode.addNode("node1");
+ n1.addNode("jc").setProperty("text", "hello");
+ Node n2 = testRootNode.addNode("node2");
+ n2.addNode("jc").setProperty("text", "hallo");
+ Node n3 = testRootNode.addNode("node3");
+ n3.addNode("jc").setProperty("text", "oh hallo");
+ session.save();
+
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ String xpath = "//*[jcr:contains(jc/@text, 'hello OR
hallo')]/(rep:facet(jc/text)) order by jcr:path";
+ Query q = qm.createQuery(xpath, Query.XPATH);
+ QueryResult result = q.execute();
+ FacetResult facetResult = new FacetResult(result);
+ assertNotNull(facetResult);
+ assertNotNull(facetResult.getDimensions());
+ assertEquals(1, facetResult.getDimensions().size());
+ assertTrue(facetResult.getDimensions().contains("jc/text"));
+ List<FacetResult.Facet> facets = facetResult.getFacets("jc/text");
+ assertNotNull(facets);
+ assertEquals("hallo", facets.get(0).getLabel());
+ assertEquals(1, facets.get(0).getCount(), 0);
assertEquals("hello", facets.get(1).getLabel());
assertEquals(1, facets.get(1).getCount(), 0);
assertEquals("oh hallo", facets.get(2).getLabel());
