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 0ef02534aca1d604d6dd031d2df70659ba9899c4 Merge: 3e41dbc5eb 934eb698c3 Author: Michael Blow <[email protected]> AuthorDate: Fri Jan 10 18:42:14 2025 -0500 Merge branch 'gerrit/neo' into 'gerrit/trinity' Ext-ref: MB-64328,MB-64730 Change-Id: Ib61f5486364162146b59c8ccbd21efe05f88c38d asterixdb/NOTICE | 2 +- .../rules/pushdown/ExpectedSchemaBuilder.java | 67 ++++++++++++++++++++++ .../asterix-app/data/hdfs/parquet/friends.json | 1 + .../external_dataset/ExternalDatasetTestUtils.java | 1 + .../ASTERIXDB-3540/ASTERIXDB-3540.01.ddl.sqlpp | 41 +++++++++++++ .../ASTERIXDB-3540/ASTERIXDB-3540.02.query.sqlpp | 26 +++++++++ .../ASTERIXDB-3540/ASTERIXDB-3540.03.query.sqlpp | 25 ++++++++ .../query-ASTERIXDB-3538.1.ddl.sqlpp | 67 ++++++++++++++++++++++ .../query-ASTERIXDB-3538.2.update.sqlpp | 31 ++++++++++ .../query-ASTERIXDB-3538.3.query.sqlpp | 25 ++++++++ .../query-ASTERIXDB-3538.4.query.sqlpp | 25 ++++++++ .../query-ASTERIXDB-3538.5.query.sqlpp | 25 ++++++++ .../query-ASTERIXDB-3538.6.query.sqlpp | 24 ++++++++ .../parquet/ASTERIXDB-3540/ASTERIXDB-3540.02.plan | 1 + .../parquet/ASTERIXDB-3540/ASTERIXDB-3540.03.adm | 1 + .../query-ASTERIXDB-3538.3.plan | 24 ++++++++ .../query-ASTERIXDB-3538.4.adm | 8 +++ .../query-ASTERIXDB-3538.5.plan | 41 +++++++++++++ .../query-ASTERIXDB-3538.6.adm | 4 ++ .../src/test/resources/runtimets/sqlpp_queries.xml | 5 ++ .../runtimets/testsuite_external_dataset_s3.xml | 6 ++ hyracks-fullstack/NOTICE | 2 +- .../rules/RemoveUnusedAssignAndAggregateRule.java | 4 ++ .../dataflow/common/utils/FrameDebugUtils.java | 2 +- 24 files changed, 455 insertions(+), 3 deletions(-)
