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 th...@apache.org on 2021/11/24 14:17:00 UTC
[jackrabbit-oak] branch OAK-9625 updated (ae74561 -> 50e816e)
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a change to branch OAK-9625
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git.
from ae74561 OAK-9625 Support ordered index for first value of a multi-valued property, and path
add 4f4fdd4 OAK-9621 add failing tests for mandatory child nodes
add 3d3cb65 Revert "OAK-9621 add failing tests for mandatory child nodes"
add 089176e OAK-9617: VersionGCSplitDocTest does not clean up after test
add b375345 Merge pull request #416 from mreutegg/OAK-9617
add 309b67d OAK-9623 : EnforceDynamicMembershipTest fails sporadically
add 9fa15f6 upgrading netty dependency to 4.1.68.final jira OAK-9611
add 8317150 Merge pull request #417 from ArunOnCloud/trunk
add 2f1f625 OAK-301: Document Oak
add 06dae64 OAK-301: Document Oak
new f37d3aa Merge branch 'trunk' into OAK-9625
new 50e816e OAK-9625 Support ordered index for first value of a multi-valued property, node name, and path
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../external/impl/EnforceDynamicMembershipTest.java | 18 ++++++++++++------
.../oak/query/xpath/XPathToSQL2Converter.java | 7 +++++++
.../org/apache/jackrabbit/oak/query/xpath.txt | 4 ++--
oak-doc/README.md | 2 +-
oak-doc/src/site/markdown/plugins/blobstore.md | 1 +
oak-segment-tar/pom.xml | 2 +-
.../oak/plugins/document/VersionGCSplitDocTest.java | 2 ++
7 files changed, 26 insertions(+), 10 deletions(-)
[jackrabbit-oak] 01/02: Merge branch 'trunk' into OAK-9625
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a commit to branch OAK-9625
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit f37d3aa7ef2855df3be05533aab70d8b4cf5cf7c
Merge: ae74561 06dae64
Author: thomasm <th...@apache.org>
AuthorDate: Wed Nov 24 12:17:47 2021 +0100
Merge branch 'trunk' into OAK-9625
.../external/impl/EnforceDynamicMembershipTest.java | 18 ++++++++++++------
oak-doc/README.md | 2 +-
oak-doc/src/site/markdown/plugins/blobstore.md | 1 +
oak-segment-tar/pom.xml | 2 +-
.../oak/plugins/document/VersionGCSplitDocTest.java | 2 ++
5 files changed, 17 insertions(+), 8 deletions(-)
[jackrabbit-oak] 02/02: OAK-9625 Support ordered index for first value of a multi-valued property, node name, and path
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a commit to branch OAK-9625
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 50e816e4f40b8c7bae701f4b818d16c89aba6a63
Author: thomasm <th...@apache.org>
AuthorDate: Wed Nov 24 15:16:53 2021 +0100
OAK-9625 Support ordered index for first value of a multi-valued property, node name, and path
---
.../apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java | 7 +++++++
.../src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
index c2d7b62..4182f4d 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/XPathToSQL2Converter.java
@@ -724,6 +724,13 @@ public class XPathToSQL2Converter {
Expression.Cast c = new Expression.Cast(expr, "date");
read(")");
return c;
+ } else if ("fn:coalesce".equals(functionName)) {
+ Expression.Function f = new Expression.Function("coalesce");
+ f.params.add(parseExpression());
+ read(",");
+ f.params.add(parseExpression());
+ read(")");
+ return f;
} else if ("jcr:first".equals(functionName)) {
Expression.Function f = new Expression.Function("first");
f.params.add(parseExpression());
diff --git a/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt b/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
index 900200e..d24b313 100644
--- a/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
+++ b/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/xpath.txt
@@ -29,9 +29,9 @@
xpath2sql /jcr:root/content//element(*, nt:base)[fn:path() >= $lastValue] order by fn:path()
select [jcr:path], [jcr:score], *
from [nt:base] as a
- where path() >= @lastValue
+ where path(a) >= @lastValue
and isdescendantnode(a, '/content')
- order by path()
+ order by path(a)
/* xpath ... */
xpath2sql /jcr:root/content//element(*, nt:base)[jcr:first(@vanityPath) >= $lastValue] order by jcr:first(@vanityPath), @jcr:path