Author: catholicon
Date: Thu Nov 2 06:49:33 2017
New Revision: 1814034
URL: http://svn.apache.org/viewvc?rev=1814034&view=rev
Log:
OAK-6750: Lucene facets don't work with relative properties (backport to 1.6)
OAK-6792: rep:facet not supported in xpath (backport to 1.6)
Backporting r1811380, r1811952, r1811963 and r1811986 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
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 Thu Nov 2 06:49:33 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/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,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,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,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851
-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811655,1813192
+/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,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,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,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851
-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 2 06:49:33 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
-/jackrabbit/oak/trunk/oak-core: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,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,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,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,180585
1-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256
+/jackrabbit/oak/trunk/oak-core: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,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,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,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,180585
1-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986
/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812750,1812753
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1814034&r1=1814033&r2=1814034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Thu Nov 2 06:49:33 2017
@@ -623,7 +623,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))) {
@@ -658,7 +659,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);
@@ -666,7 +667,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.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java?rev=1814034&r1=1814033&r2=1814034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
Thu Nov 2 06:49:33 2017
@@ -234,6 +234,20 @@ public class XPathToSQL2Converter {
rewindSelector();
Expression.Property p = new
Expression.Property(currentSelector, "rep:excerpt", false);
statement.addSelectColumn(p);
+ } else if ("rep:facet".equals(identifier)) {
+ // this will also deal with relative properties
+ // (functions and so on are also working, but this is
probably not needed)
+ 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);
} else {
throw getSyntaxError();
}
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt?rev=1814034&r1=1814033&r2=1814034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
Thu Nov 2 06:49:33 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.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=1814034&r1=1814033&r2=1814034&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
Thu Nov 2 06:49:33 2017
@@ -47,16 +47,27 @@ 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);
- markIndexForReindex();
- 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);
+ markIndexForReindex();
+ 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);
markIndexForReindex();
superuser.save();
@@ -74,6 +85,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();
@@ -130,6 +147,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());
