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 7808ac04781c41a6c8f0dc5f3464169683447b06
Merge: 9fa1355a70 c5851fed33
Author: Apache AsterixDB Gerrit <[email protected]>
AuthorDate: Tue Dec 17 01:53:55 2024 +0000

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

 asterixdb/asterix-app/pom.xml                      |   2 +-
 .../app/resource/PlanStagesGeneratorTest.java      |  10 +-
 .../external_dataset/ExternalDatasetTestUtils.java |   2 +
 .../avro/AvroFileExampleGeneratorUtil.java         |  55 +-
 .../ASTERIXDB-3534/ASTERIXDB-3534.001.ddl.sqlpp}   |  27 +-
 .../ASTERIXDB-3534/ASTERIXDB-3534.002.update.sqlpp |  33 +
 .../ASTERIXDB-3534/ASTERIXDB-3534.003.query.sqlpp} |  23 +-
 .../avro-types/avro-union/avro-union.01.ddl.sqlpp  |  11 +-
 ...nion.01.ddl.sqlpp => avro-union.03.query.sqlpp} |  25 +-
 .../heterogeneous-access.1.ddl.sqlpp               |   2 +-
 .../assembly/ASTERIXDB-3534/ASTERIXDB-3534.003.adm |   3 +
 .../avro/avro-types/avro-map/avro-map.02.adm       |   2 +
 .../avro/avro-types/avro-map/avro-map.03.adm       |   4 +-
 .../avro-nested-records/avro-nested-records.02.adm |   4 +-
 .../avro-nested-records/avro-nested-records.03.adm |   4 +-
 .../avro-primitives/avro-primitives.02.adm         |   4 +-
 .../avro-primitives/avro-primitives.03.adm         |   4 +-
 .../avro/avro-types/avro-union/avro-union.02.adm   |   2 +
 .../avro/avro-types/avro-union/avro-union.03.adm   | 100 +++
 .../org/apache/asterix/column/ColumnManager.java   |   4 +-
 .../operation/lsm/flush/FlushColumnMetadata.java   |  47 +-
 .../lsm/flush/FlushColumnTupleWriter.java          |  48 +-
 .../lsm/flush/NoWriteColumnTransformer.java        | 141 ++++
 .../lsm/flush/NoWriteFlushColumnMetadata.java      | 202 ++++++
 .../lsm/merge/MergeColumnTupleWriter.java          |   7 +-
 .../values/reader/AbstractColumnValuesReader.java  |  59 +-
 .../values/writer/NoOpColumnValuesWriter.java      | 124 ++++
 .../column/test/bytes/AbstractBytesTest.java       |   2 +-
 asterixdb/asterix-external-data/pom.xml            |  12 +-
 .../asterix/external/parser/AvroDataParser.java    |   5 +
 asterixdb/asterix-server/pom.xml                   |   4 +
 asterixdb/pom.xml                                  | 109 +++-
 .../appended-resources/supplemental-models.xml     | 714 ++++++++++++++-------
 ...-library-for-java_refs_tags_v1.17.1_LICENSE.txt |  34 +-
 ..._tags_azure-core-http-netty_1.13.11_LICENSE.txt |  21 +
 ..._tags_azure-core-http-netty_1.13.11_NOTICE.txt} |  22 +-
 ...or-java_refs_tags_azure-core_1.45.1_LICENSE.txt |  21 +
 ...or-java_refs_tags_azure-core_1.45.1_NOTICE.txt} |  22 +-
 ...ava_refs_tags_azure-identity_1.13.3_LICENSE.txt |  21 +
 ...java_refs_tags_azure-identity_1.13.3_NOTICE.txt |   2 +-
 ...for-java_refs_tags_azure-json_1.3.0_LICENSE.txt |  21 +
 ...for-java_refs_tags_azure-json_1.3.0_NOTICE.txt} |   2 +-
 ...efs_tags_azure-storage-blob_12.25.1_LICENSE.txt |  21 +
 ...efs_tags_azure-storage-blob_12.25.1_NOTICE.txt} |  22 +-
 ...s_tags_azure-storage-common_12.24.1_LICENSE.txt |  21 +
 ...s_tags_azure-storage-common_12.24.1_NOTICE.txt} |  20 -
 ...azure-storage-file-datalake_12.18.1_LICENSE.txt |  21 +
 ...azure-storage-file-datalake_12.18.1_NOTICE.txt} |  20 -
 ...azure-storage-internal-avro_12.10.1_LICENSE.txt |  21 +
 ...azure-storage-internal-avro_12.10.1_NOTICE.txt} |  20 -
 ...it_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt} |   2 +-
 ...rcontent.com_grpc_grpc-java_v1.68.1_NOTICE.txt} |   0
 ...com_netty_netty_netty-4.1.115.Final_NOTICE.txt} |   2 +-
 ...ntent.com_perfmark_perfmark_v0.27.0_NOTICE.txt} |   1 +
 ...streams_reactive-streams-jvm_v1.0.3_COPYING.txt | 121 ----
 ...streams_reactive-streams-jvm_v1.0.3_LICENSE.txt |   8 -
 .../column/api/AbstractColumnTupleWriter.java      |   8 +-
 .../column/impls/btree/ColumnBTreeBulkloader.java  |   3 +-
 .../impls/btree/ColumnBTreeWriteLeafFrame.java     |   2 +-
 hyracks-fullstack/pom.xml                          |  17 +-
 60 files changed, 1613 insertions(+), 678 deletions(-)

Reply via email to