Author: thomasm
Date: Thu Oct 5 12:57:11 2017
New Revision: 1811202
URL: http://svn.apache.org/viewvc?rev=1811202&view=rev
Log:
OAK-6778 XPath union with explain doesn't explain
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
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=1811202&r1=1811201&r2=1811202&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 5 12:57:11 2017
@@ -1148,6 +1148,8 @@ public class XPathToSQL2Converter {
}
result.orderList = orderList;
result.queryOptions = queryOptions;
+ result.setExplain(statement.explain);
+ result.setMeasure(statement.measure);
return result;
}
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=1811202&r1=1811201&r2=1811202&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 5 12:57:11 2017
@@ -24,6 +24,20 @@
# * new tests are typically be added on top, after the syntax docs
# * use ascii character only
+# OAK-6778
+
+xpath2sql explain /jcr:root/content/(activities|people)//element(*, acme:Asset)
+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
+ where isdescendantnode(a, '/content/activities')
+ /* xpath ... */
+
# OAK-937
xpath2sql /jcr:root/content//* option(index tag a, index name b)
