This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit d83f0a653a7246f90197fb75ee2aea8cff50b382
Merge: a641846f63 d6df343b83
Author: Apache AsterixDB Gerrit <[email protected]>
AuthorDate: Wed Dec 13 22:46:45 2023 +0000

    Merge "Merge branch 'gerrit/trinity' into 'master'"

 .../asterix/optimizer/base/RuleCollections.java    |   3 +
 .../rules/RemoveUnusedOneToOneEquiJoinRule.java    |  11 +-
 .../http/server/QueryServiceRequestParameters.java |  22 +++-
 .../api/http/server/QueryServiceServlet.java       |  19 ++--
 .../org/apache/asterix/utils/RedactionUtil.java    |   3 +
 .../queries/external-cross-product.sqlpp}          |  20 ++--
 .../optimizerts/queries/query_issue3316.sqlpp      |   9 +-
 .../results/external-cross-product.plan            |  45 +++++++++
 .../join/nlj-outer/nlj-outer.00.ddl.sqlpp          |  57 +++++++++++
 .../nlj-outer/nlj-outer.01.update.sqlpp}           |  20 ++--
 .../nlj-outer/nlj-outer.10.query.sqlpp}            |  16 ++-
 .../nlj-outer/nlj-outer.11.query.sqlpp}            |  16 ++-
 .../nlj-outer/nlj-outer.20.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.21.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.30.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.31.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.40.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.41.query.sqlpp}            |  17 ++--
 .../nlj-outer/nlj-outer.50.query.sqlpp}            |  16 ++-
 .../nlj-outer/nlj-outer.51.query.sqlpp}            |  16 ++-
 .../offset_without_limit.7.query.sqlpp}            |   9 +-
 .../query-ASTERIXDB-3316.1.ddl.sqlpp               |   5 +-
 .../results/join/nlj-outer/nlj-outer.10.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.11.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.20.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.21.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.30.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.31.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.40.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.41.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.50.adm        |   1 +
 .../results/join/nlj-outer/nlj-outer.51.adm        |   1 +
 .../offset_without_limit.7.adm                     |   1 +
 .../src/test/resources/runtimets/sqlpp_queries.xml |   5 +
 .../lang/sqlpp/visitor/FreeVariableVisitor.java    |   7 +-
 .../rules/ConsolidateLeftOuterJoinSelectsRule.java | 112 +++++++++++++++++++++
 .../apache/hyracks/api/util/ExceptionUtils.java    |   2 +-
 .../org/apache/hyracks/http/server/HttpServer.java |  66 ++++++++----
 38 files changed, 422 insertions(+), 170 deletions(-)

Reply via email to