Author: thomasm
Date: Thu Jan 18 13:43:35 2018
New Revision: 1821493
URL: http://svn.apache.org/viewvc?rev=1821493&view=rev
Log:
OAK-7131 xpath to sql2 conversion drops order by clause for some cases
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/xpath/Statement.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
jackrabbit/oak/branches/1.6/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 18 13:43:35 2018
@@ -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,1790502-1790503,1792049,1792463,1792483,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,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1818645,1819048,1819050
+/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,1790502-1790503,1792049,1792463,1792483,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,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1818645,1819048,1819050,1821358
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 18 13:43:35 2018
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
-/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,1789441,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-180395
5,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645
+/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,1789441,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-180395
5,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821358
/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java?rev=1821493&r1=1821492&r2=1821493&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
Thu Jan 18 13:43:35 2018
@@ -303,7 +303,13 @@ public class Statement {
// no change
return this;
}
- return new UnionStatement(s1b, s2b);
+ UnionStatement union = new UnionStatement(s1b, s2b);
+ union.explain = explain;
+ union.measure = measure;
+ union.orderList = orderList;
+ union.queryOptions = queryOptions;
+ union.xpathQuery = xpathQuery;
+ return union;
}
@Override
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java?rev=1821493&r1=1821492&r2=1821493&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
Thu Jan 18 13:43:35 2018
@@ -521,10 +521,22 @@ public abstract class AbstractQueryTest
}
static String formatSQL(String sql) {
+ int start = 0;
+ while (true) {
+ int index = sql.indexOf("/* ", start);
+ if (index < 0) {
+ break;
+ }
+ int end = sql.indexOf(" */", index);
+ sql = sql.substring(0, index).trim() + "\n /* xpath ... " +
sql.substring(end).trim();
+ sql = sql.trim();
+ start = index + 7;
+ }
+
// the "(?s)" is enabling the "dot all" flag
// keep /* xpath ... */ to ensure the xpath comment
// is really there (and at the right position)
- sql = sql.replaceAll("(?s) /\\* .* \\*/", "\n /* xpath ...
*/").trim();
+// sql = sql.replaceAll("(?s) /\\* [^\\*]* \\*/", "\n /* xpath ...
*/").trim();
sql = sql.replaceAll(" union select ", "\n union select ");
sql = sql.replaceAll(" from ", "\n from ");
sql = sql.replaceAll(" where ", "\n where ");
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=1821493&r1=1821492&r2=1821493&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 Jan 18 13:43:35 2018
@@ -24,6 +24,58 @@
# * new tests are typically be added on top, after the syntax docs
# * use ascii character only
+#Â OAK-7131
+
+xpath2sql /jcr:root/content[@a=1 or @b=2] order by @foo option(traversal ok)
+select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/content')
+ and [a] = 1
+ union select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/content')
+ and [b] = 2
+ order by [foo] option(traversal OK)
+ /* xpath ... */
+
+xpath2sql /jcr:root/(content | dam)[@a=1 or @b=2] order by @foo
+select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/content')
+ and [a] = 1
+ union select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/content')
+ and [b] = 2
+ /* xpath ... */
+ union select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/dam')
+ and [a] = 1
+ union select [jcr:path], [jcr:score], *
+ from [nt:base] as a
+ where issamenode(a, '/dam')
+ and [b] = 2
+ /* xpath ... */
+ order by [foo]
+
+xpath2sql //(element(*, type1) | element(*, type2))[@a='b' or @c='d'] order by
@foo option(traversal OK)
+select [jcr:path], [jcr:score], *
+ from [type1] as a
+ where [a] = 'b'
+ union select [jcr:path], [jcr:score], *
+ from [type1] as a
+ where [c] = 'd'
+ /* xpath ... */
+ union select [jcr:path], [jcr:score], *
+ from [type2] as a
+ where [a] = 'b'
+ union select [jcr:path], [jcr:score], *
+ from [type2] as a
+ where [c] = 'd'
+ /* xpath ... */
+ order by [foo] option(traversal OK)
+
# OAK-6792
xpath2sql /jcr:root//*/(rep:facet(jcr:data/jcr:createdBy))
