This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from bd4b690561 OAK-9778 : Improve exception message with
OakAccessControl0013 regarding ACE duplicates
new af8e31dc22 OAK-9740 - Adding support for specifying the limit / offset
as options in the query:
new c47c626986 OAK-9740 - ensuring that the parsed values are respected
new 96e1c05787 Merge branch 'apache:trunk' into OAK-9740
new ec77ada323 Adding support for union queries and cleaning up to use
optionals rather than -1
new 88d5800377 Adding a test to verify that the query limit overrides the
option limit
new 675c66a277 Addressing PR feedback
new 051791d174 Addressing PR feedback to not get value twice
new 5a700ccea1 Fixing typo
new 046b9d8a8f Simplifying joining
new 1cb24971e8 Replacing similar methods with generic version
new ad42afa457 Merge branch 'trunk' into OAK-9740
new a8284b6e86 Merge branch 'trunk' into OAK-9740
new 8c088aecda Fixing assignment mistake in limit / override
new 6dce85c4b0 Removing magic variables
new 8ac5ee902d Moving the maxentrycount outside the loop and simplifying it
new 0457314a9a Fixing missing space
new bcf0492c2b Merge branch 'trunk' into OAK-9740
new 5f8b8be9e0 Merge pull request #535 from klcodanr/OAK-9740
The 17711 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:
.../org/apache/jackrabbit/oak/api/QueryEngine.java | 19 ++++++
.../apache/jackrabbit/oak/api/package-info.java | 2 +-
.../org/apache/jackrabbit/oak/query/Query.java | 12 ++--
.../jackrabbit/oak/query/QueryEngineImpl.java | 49 +++++++++++-----
.../org/apache/jackrabbit/oak/query/QueryImpl.java | 41 +++++++------
.../apache/jackrabbit/oak/query/QueryOptions.java | 4 ++
.../apache/jackrabbit/oak/query/SQL2Parser.java | 13 +++++
.../jackrabbit/oak/query/UnionQueryImpl.java | 41 ++++++++-----
.../jackrabbit/oak/query/xpath/Statement.java | 30 +++++-----
.../oak/query/xpath/XPathToSQL2Converter.java | 31 ++++++++--
.../jackrabbit/oak/query/QueryLimitTest.java | 29 ++++++++--
.../jackrabbit/oak/query/SQL2ParserTest.java | 34 +++++++++++
.../jackrabbit/oak/query/UnionQueryTest.java | 31 ++++++++--
.../jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java | 2 +
oak-doc/src/site/markdown/query/grammar-sql2.md.vm | 4 ++
.../src/site/markdown/query/grammar-xpath.md.vm | 3 +
oak-doc/src/site/markdown/query/query-engine.md | 25 +++++++-
oak-doc/src/site/resources/grammar/sql2.csv | 4 +-
oak-doc/src/site/resources/grammar/xpath.csv | 4 +-
.../apache/jackrabbit/oak/jcr/query/QueryImpl.java | 9 +--
.../jackrabbit/oak/jcr/query/QueryManagerImpl.java | 3 +-
.../oak/jcr/query/qom/QueryObjectModelImpl.java | 11 ++--
.../apache/jackrabbit/oak/jcr/query/QueryTest.java | 67 ++++++++++++++++++++++
23 files changed, 370 insertions(+), 98 deletions(-)
