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/01/19 13:47:46 UTC
svn commit: r1821653 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
test/resources/org/apache/jackrabbit/oak/query/xpath.txt
Author: catholicon
Date: Fri Jan 19 13:47:46 2018
New Revision: 1821653
URL: http://svn.apache.org/viewvc?rev=1821653&view=rev
Log:
OAK-7151: Support indexed based excerpts on properties
Implement xpath parsing including multiple columns (separated by comma)
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=1821653&r1=1821652&r2=1821653&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 Fri Jan 19 13:47:46 2018
@@ -230,9 +230,25 @@ public class XPathToSQL2Converter {
read(")");
}
} else if ("rep:excerpt".equals(identifier)) {
- readOpenDotClose(false);
- rewindSelector();
- Expression.Property p = new Expression.Property(currentSelector, "rep:excerpt", false);
+ Expression.Property p;
+
+ if (readIf(".")) {
+ rewindSelector();
+ p = new Expression.Property(currentSelector, "rep:excerpt", false);
+ } else {
+ // this will also deal with relative properties
+ Expression e = parseExpression();
+ if (!(e instanceof Expression.Property)) {
+ throw getSyntaxError();
+ }
+ Expression.Property prop = (Expression.Property) e;
+ String property = prop.getColumnAliasName();
+ rewindSelector();
+ p = new Expression.Property(currentSelector,
+ "rep:excerpt(" + property + ")", false);
+ }
+ read(")");
+
statement.addSelectColumn(p);
} else {
throw getSyntaxError();
@@ -253,8 +269,24 @@ public class XPathToSQL2Converter {
Expression.Property p = readProperty();
statement.addSelectColumn(p);
} else if (readIf("rep:excerpt")) {
- readOpenDotClose(true);
- Expression.Property p = new Expression.Property(currentSelector, "rep:excerpt", false);
+ Expression.Property p;
+
+ read("(");
+ if (readIf(".")) {
+ p = new Expression.Property(currentSelector, "rep:excerpt", false);
+ } else {
+ // this will also deal with relative properties
+ Expression e = parseExpression();
+ if (!(e instanceof Expression.Property)) {
+ throw getSyntaxError();
+ }
+ Expression.Property prop = (Expression.Property) e;
+ String property = prop.getColumnAliasName();
+ p = new Expression.Property(currentSelector,
+ "rep:excerpt(" + property + ")", false);
+ }
+ read(")");
+
statement.addSelectColumn(p);
} else if (readIf("rep:spellcheck")) {
// only rep:spellcheck() is currently supported
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=1821653&r1=1821652&r2=1821653&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 Fri Jan 19 13:47:46 2018
@@ -76,6 +76,85 @@ select [jcr:path], [jcr:score], *
/* xpath ... */
order by [foo] option(traversal OK)
+# OAK-7151
+xpath2sql //*[@a='b']/rep:excerpt(.)
+select [jcr:path], [jcr:score], [rep:excerpt]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(.))
+select [jcr:path], [jcr:score], [rep:excerpt]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/rep:excerpt(@a)
+select [jcr:path], [jcr:score], [rep:excerpt(a)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(@a))
+select [jcr:path], [jcr:score], [rep:excerpt(a)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/rep:excerpt(a/@b)
+select [jcr:path], [jcr:score], [rep:excerpt(a/b)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(a/@b))
+select [jcr:path], [jcr:score], [rep:excerpt(a/b)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/rep:excerpt(a/b/@c)
+select [jcr:path], [jcr:score], [rep:excerpt(a/b/c)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(a/b/@c))
+select [jcr:path], [jcr:score], [rep:excerpt(a/b/c)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(@a) | rep:excerpt(@b))
+select [jcr:path], [jcr:score], [rep:excerpt(a)], [rep:excerpt(b)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(@a) | rep:excerpt(@b) | rep:excerpt(@c))
+select [jcr:path], [jcr:score], [rep:excerpt(a)], [rep:excerpt(b)], [rep:excerpt(c)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(rel/@a) | rep:excerpt(rel/@b))
+select [jcr:path], [jcr:score], [rep:excerpt(rel/a)], [rep:excerpt(rel/b)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(.) | rep:excerpt(@a))
+select [jcr:path], [jcr:score], [rep:excerpt], [rep:excerpt(a)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
+xpath2sql //*[@a='b']/(rep:excerpt(.) | rep:excerpt(rel/@a) | rep:excerpt(rel/@b))
+select [jcr:path], [jcr:score], [rep:excerpt], [rep:excerpt(rel/a)], [rep:excerpt(rel/b)]
+ from [nt:base] as a
+ where [a] = 'b'
+ /* xpath ... */
+
# OAK-6792
xpath2sql /jcr:root//*/(rep:facet(jcr:data/jcr:createdBy))