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 2017/10/12 12:29:13 UTC
svn commit: r1811952 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/
oak-core/src/test/resources/org/apache/jackrabbit/oak/query/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/
Author: catholicon
Date: Thu Oct 12 12:29:12 2017
New Revision: 1811952
URL: http://svn.apache.org/viewvc?rev=1811952&view=rev
Log:
OAK-6792: rep:facet not supported in xpath
Applying patch provided by Thomas Mueller and added 2 tests for
relative/non-relative path in oak-lucene
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java?rev=1811952&r1=1811951&r2=1811952&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java Thu Oct 12 12:29:12 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/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt?rev=1811952&r1=1811951&r2=1811952&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt Thu Oct 12 12:29:12 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-6778
xpath2sql explain /jcr:root/content/(activities|people)//element(*, acme:Asset)
@@ -31,7 +46,7 @@ explain select [jcr:path], [jcr:score],
from [acme:Asset] as a
where isdescendantnode(a, '/content/activities')
/* xpath ... */
-
+
xpath2sql explain measure /jcr:root/content/(activities|people)//element(*, acme:Asset)
explain measure select [jcr:path], [jcr:score], *
from [acme:Asset] as a
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811952&r1=1811951&r2=1811952&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java Thu Oct 12 12:29:12 2017
@@ -156,6 +156,44 @@ public class FacetTest extends AbstractQ
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.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("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");
@@ -173,6 +211,44 @@ public class FacetTest extends AbstractQ
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"));