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 adab531ced265f1bfcb4c1d7260f7ab22cf79cb0 Merge: a4160334f8 873feb5488 Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Wed Aug 14 16:03:06 2024 +0000 Merge "Merge branch 'gerrit/goldfish' into 'master'" .../schema/AbstractComplexExpectedSchemaNode.java | 36 +++++++----- .../schema/AbstractExpectedSchemaNode.java | 32 +++++++--- .../pushdown/schema/AnyExpectedSchemaNode.java | 24 ++++---- .../pushdown/schema/ArrayExpectedSchemaNode.java | 13 +++-- .../pushdown/schema/ExpectedSchemaBuilder.java | 24 ++++---- .../rules/pushdown/schema/IExpectedSchemaNode.java | 25 +++++--- .../pushdown/schema/ObjectExpectedSchemaNode.java | 53 ++++++++++------- .../pushdown/schema/RootExpectedSchemaNode.java | 5 +- .../pushdown/schema/UnionExpectedSchemaNode.java | 28 +++++---- .../visitor/ExpectedSchemaMergerVisitor.java | 20 ++++--- .../ExpressionToExpectedSchemaNodeVisitor.java | 6 +- .../api/http/server/ActiveRequestsServlet.java | 2 +- .../apache/asterix/app/result/ResultPrinter.java | 30 +++++----- .../asterix/test/common/ResultExtractor.java | 7 ++- .../other-pushdowns.022.query.sqlpp} | 31 +++++----- .../other-pushdowns.023.query.sqlpp} | 27 +++------ .../other-pushdowns.024.query.sqlpp} | 27 +++------ .../other-pushdowns.025.query.sqlpp} | 26 +++------ .../other-pushdowns.026.query.sqlpp} | 27 +++------ .../other-pushdowns.027.query.sqlpp} | 29 ++++----- .../column/upsert/003/003.001.ddl.sqlpp} | 28 ++++----- .../column/upsert/003/003.002.update.sqlpp} | 25 +++----- .../column/upsert/003/003.003.get.http} | 20 +------ .../column/upsert/003/003.004.query.sqlpp} | 22 ++----- .../pushdown-plans/pushdown-plans.12.query.sqlpp} | 27 +++------ .../pushdown-plans/pushdown-plans.13.query.sqlpp} | 26 +++------ .../pushdown-plans/pushdown-plans.14.query.sqlpp} | 27 +++------ .../pushdown-plans/pushdown-plans.15.query.sqlpp} | 29 ++++----- .../cache-residency/cache-residency.001.regexjson | 4 +- .../cache-residency/cache-residency.002.regexjson | 4 +- .../format-param-in-accept-01.1.regexjson | 2 +- .../multiple-param-values.1.regexjson | 2 +- .../other-pushdowns/other-pushdowns.022.plan | 68 ++++++++++++++++++++++ .../other-pushdowns/other-pushdowns.023.plan | 28 +++++++++ .../other-pushdowns/other-pushdowns.024.plan | 38 ++++++++++++ .../other-pushdowns/other-pushdowns.025.plan | 22 +++++++ .../other-pushdowns/other-pushdowns.026.plan | 38 ++++++++++++ .../other-pushdowns/other-pushdowns.027.plan | 26 +++++++++ .../results/column/upsert/003/003.003.regexadm | 1 + .../results/column/upsert/003/003.004.adm | 1 + .../parquet/pushdown-plans/pushdown-plans.12.plan | 36 ++++++++++++ .../parquet/pushdown-plans/pushdown-plans.13.plan | 20 +++++++ .../parquet/pushdown-plans/pushdown-plans.14.plan | 36 ++++++++++++ .../parquet/pushdown-plans/pushdown-plans.15.plan | 24 ++++++++ .../warnings-limit/warnings-limit.03.regexadm | 16 +---- .../warnings-limit/warnings-limit.04.regexadm | 16 +---- .../warnings-limit/warnings-limit.05.regexadm | 16 +---- .../warnings-limit/warnings-limit.07.regexadm | 16 +---- .../warnings-limit/warnings-limit.08.regexadm | 16 +---- .../other-pushdowns/other-pushdowns.022.plan | 68 ++++++++++++++++++++++ .../other-pushdowns/other-pushdowns.023.plan | 28 +++++++++ .../other-pushdowns/other-pushdowns.024.plan | 38 ++++++++++++ .../other-pushdowns/other-pushdowns.025.plan | 22 +++++++ .../other-pushdowns/other-pushdowns.026.plan | 38 ++++++++++++ .../other-pushdowns/other-pushdowns.027.plan | 26 +++++++++ .../src/test/resources/runtimets/sqlpp_queries.xml | 14 ++++- .../cloud/clients/aws/s3/S3CloudClient.java | 7 ++- .../column/assembler/value/UUIDValueGetter.java | 5 +- .../lsm/merge/MergeColumnTupleWriter.java | 26 ++++++--- .../RepeatedPrimitiveColumnValuesReader.java | 27 +++++---- .../values/reader/value/UUIDValueReader.java | 4 +- .../resources/result/assembler/000-arrayOfInt.json | 20 +++---- .../result/assembler/001-arrayObject.json | 2 +- .../result/assembler/002-arrayObject2.json | 8 +-- .../resources/result/assembler/003-arrayEmpty.json | 6 +- .../resources/result/assembler/100-addFields.json | 8 +-- .../result/assembler/101-nestedAddFields.json | 8 +-- .../result/assembler/200-unionPrimitive.json | 8 +-- .../result/assembler/201-unionPrimitiveObject.json | 4 +- .../result/assembler/202-unionPrimitiveArray.json | 8 +-- .../result/assembler/203-unionNestedNested.json | 8 +-- .../assembler/204-unionArrayPrimitiveItems.json | 10 ++-- .../205-unionArrayPrimitiveObjectItems.json | 10 ++-- .../206-unionArrayPrimitiveObjectArrayItems.json | 10 ++-- .../result/assembler/207-unionArrayNullItems0.json | 6 +- .../result/assembler/208-unionArrayNullItems1.json | 6 +- .../result/assembler/209-unionArrayNullItems2.json | 6 +- .../result/assembler/210-unionArrayNullItems3.json | 2 +- .../result/assembler/301-null-primitive.json | 8 +-- .../result/assembler/310-null-object0.json | 8 +-- .../result/assembler/311-null-object1.json | 8 +-- .../result/assembler/312-null-object2.json | 8 +-- .../result/assembler/313-null-object3.json | 8 +-- .../result/assembler/320-null-array0.json | 8 +-- .../result/assembler/321-null-array1.json | 8 +-- .../result/assembler/322-null-array2.json | 8 +-- .../result/assembler/323-null-array3.json | 8 +-- .../result/assembler/324-null-array4.json | 8 +-- .../result/assembler/325-null-array5.json | 8 +-- .../result/assembler/326-null-array6.json | 8 +-- .../result/assembler/327-null-array7.json | 8 +-- .../result/assembler/900-dummy-tweet.json | 4 +- .../resources/result/small/000-arrayOfInt.json | 20 +++---- .../resources/result/small/001-arrayObject.json | 2 +- .../resources/result/small/002-arrayObject2.json | 8 +-- .../resources/result/small/003-arrayEmpty.json | 6 +- .../test/resources/result/small/100-addFields.json | 8 +-- .../result/small/101-nestedAddFields.json | 8 +-- .../resources/result/small/200-unionPrimitive.json | 8 +-- .../result/small/201-unionPrimitiveObject.json | 4 +- .../result/small/202-unionPrimitiveArray.json | 8 +-- .../result/small/203-unionNestedNested.json | 8 +-- .../result/small/204-unionArrayPrimitiveItems.json | 10 ++-- .../small/205-unionArrayPrimitiveObjectItems.json | 10 ++-- .../206-unionArrayPrimitiveObjectArrayItems.json | 10 ++-- .../result/small/207-unionArrayNullItems0.json | 6 +- .../result/small/208-unionArrayNullItems1.json | 6 +- .../result/small/209-unionArrayNullItems2.json | 6 +- .../result/small/210-unionArrayNullItems3.json | 2 +- .../resources/result/small/301-null-primitive.json | 8 +-- .../resources/result/small/310-null-object0.json | 8 +-- .../resources/result/small/311-null-object1.json | 8 +-- .../resources/result/small/312-null-object2.json | 8 +-- .../resources/result/small/313-null-object3.json | 8 +-- .../resources/result/small/320-null-array0.json | 8 +-- .../resources/result/small/321-null-array1.json | 8 +-- .../resources/result/small/322-null-array2.json | 8 +-- .../resources/result/small/323-null-array3.json | 8 +-- .../resources/result/small/324-null-array4.json | 8 +-- .../resources/result/small/325-null-array5.json | 8 +-- .../resources/result/small/326-null-array6.json | 8 +-- .../resources/result/small/327-null-array7.json | 8 +-- .../resources/result/small/900-dummy-tweet.json | 4 +- .../asterix/metadata/utils/PushdownUtil.java | 21 +++++++ .../printer/json/clean/APrintVisitor.java | 4 +- .../printer/json/losslessadm/APrintVisitor.java | 4 +- .../asterix/runtime/functions/FunctionManager.java | 6 +- .../runtime/writers/PrinterBasedWriterFactory.java | 3 +- .../tests/pushruntime/PushRuntimeTest.java | 12 ++-- .../test/resources/results/scanMicroSortWrite.out | 26 +-------- .../control/cc/ClusterControllerService.java | 4 +- .../hyracks/control/nc/NodeControllerService.java | 4 +- .../lsm/btree/column/impls/lsm/LSMColumnBTree.java | 6 ++ .../am/lsm/common/impls/AbstractLSMIndex.java | 4 ++ 134 files changed, 1219 insertions(+), 760 deletions(-)
