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 fa1f0e5626e12e89c68bf68a14a6cadd66311c21
Merge: eec9173e03 78ba930a42
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Thu Jun 26 15:14:54 2025 -0400
Merge branch 'gerrit/ionic' into 'master'
Change-Id: Ifafe382d3296d477e92c67427b67ece729d9b46c
asterixdb/asterix-app/src/main/resources/cc.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc2.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc3.conf | 1 +
.../test/runtime/SqlppExecutionColumnTest.java | 2 +-
.../asterix-app/src/test/resources/cc-analyze.conf | 1 +
.../test/resources/cc-cloud-storage-azblob.conf | 1 +
.../src/test/resources/cc-cloud-storage-gcs.conf | 1 +
.../src/test/resources/cc-cloud-storage-main.conf | 1 +
.../src/test/resources/cc-cloud-storage.conf | 1 +
.../src/test/resources/cc-columnar.conf | 1 +
.../src/test/resources/cc-single-partition.conf | 3 +-
.../asterix-app/src/test/resources/cc-single.conf | 1 +
.../asterix-app/src/test/resources/cc-ssl.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc.conf | 1 +
.../src/test/resources/runtimets/ignore_column.txt | 1 +
.../runtimets/queries/objects/ObjectsQueries.xml | 15 -
.../aggregate/countn_01/countn_01.4.query.sqlpp} | 11 +-
.../aggregate/countn_01/countn_01.5.query.sqlpp} | 19 +-
.../ASTERIXDB-3597/ASTERIXDB-3597.003.query.sqlpp | 3 +-
.../ASTERIXDB-3597/ASTERIXDB-3597.004.query.sqlpp | 3 +-
.../queries_sqlpp/objects/ObjectsQueries.xml | 15 +
.../documentation-example.1.query.sqlpp} | 15 +-
.../documentation-example.2.query.sqlpp} | 14 +-
.../documentation-example.3.query.sqlpp} | 14 +-
.../documentation-example.4.query.sqlpp} | 14 +-
.../documentation-example.5.query.sqlpp} | 30 +-
.../documentation-example.6.query.sqlpp} | 30 +-
.../highly-nested-open.1.ddl.sqlpp} | 55 ++-
.../highly-nested-open.2.update.sqlpp} | 10 +-
.../highly-nested-open.3.query.sqlpp} | 12 +-
.../tiny-social-example.1.ddl.sqlpp | 81 +++++
.../tiny-social-example.2.update.sqlpp} | 19 +-
.../tiny-social-example.3.query.sqlpp} | 12 +-
.../results/aggregate/countn_01/countn_01.2.adm | 1 +
.../results/aggregate/countn_01/countn_01.3.adm | 2 +
.../documentation-example.3.adm | 2 +-
.../documentation-example.4.adm | 1 +
.../documentation-example.5.adm | 1 +
.../documentation-example.6.adm | 1 +
.../tiny-social-example/tiny-social-example.3.adm | 12 +
.../tiny-social-example/tiny-social-example.4.adm | 12 -
.../stream/in/MultiPageZeroByteBuffersReader.java | 184 ++++++++++
.../out/AbstractMultiBufferBytesOutputStream.java | 34 ++
.../bytes/stream/out/ByteBufferOutputStream.java | 4 +
...iPersistentPageZeroBufferBytesOutputStream.java | 56 +++
.../column/filter/FilterAccessorProvider.java | 16 +-
.../metadata/schema/AbstractSchemaNestedNode.java | 11 +
.../column/metadata/schema/AbstractSchemaNode.java | 68 ++++
.../column/metadata/schema/ObjectSchemaNode.java | 29 +-
.../column/metadata/schema/UnionSchemaNode.java | 22 +-
.../collection/AbstractCollectionSchemaNode.java | 13 +-
.../schema/primitive/PrimitiveSchemaNode.java | 4 +
.../visitor/SchemaBuilderFromIATypeVisitor.java | 2 +
.../operation/lsm/flush/BatchFinalizerVisitor.java | 38 ++-
.../operation/lsm/flush/ColumnTransformer.java | 52 ++-
.../operation/lsm/flush/FlushColumnMetadata.java | 40 ++-
.../lsm/flush/FlushColumnTupleWithMetaWriter.java | 3 +-
.../lsm/flush/FlushColumnTupleWriter.java | 116 ++++++-
.../lsm/flush/NoWriteColumnTransformer.java | 129 ++++++-
.../lsm/flush/NoWriteFlushColumnMetadata.java | 6 +-
.../lsm/merge/MergeColumnTupleReader.java | 2 +
.../lsm/merge/MergeColumnTupleWriter.java | 143 +++++++-
.../operation/query/QueryColumnTupleReader.java | 2 +
.../column/tuple/MergeColumnTupleReference.java | 25 +-
.../column/tuple/QueryColumnTupleReference.java | 11 +-
.../tuple/QueryColumnWithMetaTupleReference.java | 11 +-
.../asterix/column/values/IColumnBatchWriter.java | 25 +-
.../asterix/column/values/IColumnValuesWriter.java | 11 +-
.../column/values/writer/ColumnBatchWriter.java | 98 +++---
.../writer/filters/AbstractColumnFilterWriter.java | 1 -
.../column/zero/PageZeroWriterFlavorSelector.java | 133 ++++++++
.../zero/readers/DefaultColumnPageZeroReader.java | 203 +++++++++++
.../zero/readers/SparseColumnPageZeroReader.java | 149 ++++++++
.../zero/writers/DefaultColumnPageZeroWriter.java | 241 +++++++++++++
.../zero/writers/SparseColumnPageZeroWriter.java | 222 ++++++++++++
.../AbstractColumnMultiPageZeroReader.java} | 16 +-
.../DefaultColumnMultiPageZeroReader.java | 290 ++++++++++++++++
.../DefaultColumnMultiPageZeroWriter.java | 266 +++++++++++++++
.../multipage/SparseColumnMultiPageZeroReader.java | 376 +++++++++++++++++++++
.../multipage/SparseColumnMultiPageZeroWriter.java | 288 ++++++++++++++++
.../column/common/buffer/NoOpWriteMultiPageOp.java | 5 +
.../column/common/buffer/TestWriteMultiPageOp.java | 6 +
.../column/test/bytes/AbstractBytesTest.java | 19 +-
.../column/test/dummy/AbstractDummyTest.java | 9 +-
.../values/writer/NoOpColumnBatchWriter.java | 5 +-
.../impl/RecordRemoveFieldsTypeComputer.java | 5 +-
.../apache/hyracks/cloud/sweeper/SweepContext.java | 4 +
.../control/common/controllers/NCConfig.java | 17 +-
.../hyracks-storage-am-lsm-btree-column/pom.xml | 5 +
.../column/api/AbstractColumnTupleReader.java | 26 +-
.../column/api/AbstractColumnTupleWriter.java | 32 +-
.../btree/column/api/IColumnWriteMultiPageOp.java | 2 +
.../am/lsm/btree/column/cloud/ColumnRanges.java | 49 ++-
.../cloud/buffercache/IColumnReadContext.java | 3 +
.../buffercache/read/CloudColumnReadContext.java | 52 ++-
.../buffercache/read/DefaultColumnReadContext.java | 7 +
.../column/cloud/sweep/ColumnSweepPlanner.java | 10 +
.../btree/column/cloud/sweep/ColumnSweeper.java | 23 ++
.../dataflow/LSMColumnBTreeLocalResource.java | 9 +-
.../impls/btree/AbstractColumnBTreeLeafFrame.java | 11 +-
.../lsm/btree/column/impls/btree/ColumnBTree.java | 9 +-
.../column/impls/btree/ColumnBTreeBulkloader.java | 81 ++++-
.../impls/btree/ColumnBTreeRangeSearchCursor.java | 6 +-
.../impls/btree/ColumnBTreeReadLeafFrame.java | 108 +++++-
.../impls/btree/ColumnBTreeWriteLeafFrame.java | 28 +-
.../column/impls/btree/IColumnPageZeroReader.java | 80 +++++
.../column/impls/btree/IColumnPageZeroWriter.java | 172 ++++++++++
.../btree/IColumnPageZeroWriterFlavorSelector.java | 71 ++++
.../btree/column/impls/btree/IValuesWriter.java | 48 +++
.../lsm/btree/column/impls/lsm/LSMColumnBTree.java | 9 +-
...LSMColumnBTreeWithBloomFilterDiskComponent.java | 16 +-
.../lsm/tuples/AbstractColumnTupleReference.java | 28 +-
.../lsm/tuples/ColumnMultiBufferProvider.java | 8 +-
.../tuples/ColumnMultiPageZeroBufferProvider.java | 128 +++++++
.../lsm/tuples/ColumnSingleBufferProvider.java | 2 +-
.../lsm/btree/column/utils/LSMColumnBTreeUtil.java | 24 +-
.../hyracks/hyracks-storage-am-lsm-btree/pom.xml | 10 +
.../lsm/btree/dataflow/LSMBTreeLocalResource.java | 9 +-
.../storage/am/lsm/btree/impls/LSMBTree.java | 15 +-
.../storage/am/lsm/btree/utils/LSMBTreeUtil.java | 37 +-
.../hyracks/hyracks-storage-am-lsm-common/pom.xml | 5 +
.../AbstractLSMWithBloomFilterDiskComponent.java | 10 +-
.../am/lsm/common/api/ILSMDiskComponent.java | 8 +-
.../lsm/common/impls/AbstractLSMDiskComponent.java | 5 +-
.../am/lsm/common/impls/AbstractLSMIndex.java | 13 +-
.../am/lsm/common/impls/EmptyComponent.java | 5 +-
.../impls/LSMIndexDiskComponentBulkLoader.java | 10 +-
.../hyracks-storage-am-lsm-invertedindex/pom.xml | 27 +-
.../dataflow/LSMInvertedIndexLocalResource.java | 22 +-
.../lsm/invertedindex/impls/LSMInvertedIndex.java | 19 +-
.../impls/PartitionedLSMInvertedIndex.java | 30 +-
.../lsm/invertedindex/util/InvertedIndexUtils.java | 26 +-
.../hyracks/hyracks-storage-am-lsm-rtree/pom.xml | 10 +
.../lsm/rtree/dataflow/LSMRTreeLocalResource.java | 5 +-
.../LSMRTreeWithAntiMatterLocalResource.java | 5 +-
.../am/lsm/rtree/impls/AbstractLSMRTree.java | 7 +-
.../storage/am/lsm/rtree/impls/LSMRTree.java | 18 +-
.../rtree/impls/LSMRTreeWithAntiMatterTuples.java | 20 +-
.../storage/am/lsm/rtree/utils/LSMRTreeUtils.java | 54 +--
.../storage/common/buffercache/BufferCache.java | 3 +-
.../storage/common/buffercache/CachedPage.java | 3 +-
.../hyracks/test/support/TestNCServiceContext.java | 8 +-
.../org/apache/hyracks/test/support/TestUtils.java | 4 +-
.../hyracks-storage-am-lsm-btree-test/pom.xml | 6 +
.../storage/am/lsm/btree/LSMBTreeBulkLoadTest.java | 8 +-
.../lsm/btree/LSMBTreeComponentLifecycleTest.java | 8 +-
.../storage/am/lsm/btree/LSMBTreeDeleteTest.java | 8 +-
.../storage/am/lsm/btree/LSMBTreeExamplesTest.java | 6 +-
.../am/lsm/btree/LSMBTreeFileManagerTest.java | 6 +-
.../am/lsm/btree/LSMBTreeFilterMergeTest.java | 8 +-
.../storage/am/lsm/btree/LSMBTreeInsertTest.java | 8 +-
.../am/lsm/btree/LSMBTreeLifecycleTest.java | 8 +-
.../am/lsm/btree/LSMBTreeMergeFailTest.java | 10 +-
.../storage/am/lsm/btree/LSMBTreeMergeTest.java | 8 +-
.../LSMBTreeModificationOperationCallbackTest.java | 5 +-
.../am/lsm/btree/LSMBTreeMultiBulkLoadTest.java | 8 +-
.../lsm/btree/LSMBTreePageWriteCallbackTest.java | 10 +-
.../lsm/btree/LSMBTreeScanDiskComponentsTest.java | 8 +-
.../btree/LSMBTreeSearchOperationCallbackTest.java | 5 +-
...SMBTreeUpdateInPlaceScanDiskComponentsTest.java | 8 +-
.../am/lsm/btree/LSMBTreeUpdateInPlaceTest.java | 5 +-
.../storage/am/lsm/btree/LSMBTreeUpdateTest.java | 8 +-
.../storage/am/lsm/btree/impl/TestLsmBtree.java | 13 +-
.../lsm/btree/impl/TestLsmBtreeLocalResource.java | 9 +-
.../am/lsm/btree/impl/TestLsmBtreeUtil.java | 27 +-
.../btree/multithread/LSMBTreeMultiThreadTest.java | 6 +-
.../storage/am/lsm/btree/perf/LSMTreeRunner.java | 5 +-
.../am/lsm/btree/util/LSMBTreeTestContext.java | 29 +-
.../am/lsm/btree/util/LSMBTreeTestHarness.java | 7 +
.../pom.xml | 6 +
.../common/LSMInvertedIndexTestHarness.java | 7 +
.../util/LSMInvertedIndexTestContext.java | 8 +-
.../hyracks-storage-am-lsm-rtree-test/pom.xml | 6 +
.../storage/am/lsm/rtree/LSMRTreeBulkLoadTest.java | 11 +-
.../storage/am/lsm/rtree/LSMRTreeDeleteTest.java | 11 +-
.../storage/am/lsm/rtree/LSMRTreeExamplesTest.java | 11 +-
.../storage/am/lsm/rtree/LSMRTreeInsertTest.java | 11 +-
.../am/lsm/rtree/LSMRTreeLifecycleTest.java | 11 +-
.../storage/am/lsm/rtree/LSMRTreeMergeTest.java | 11 +-
.../am/lsm/rtree/LSMRTreePointMBRBulkLoadTest.java | 11 +-
.../LSMRTreeWithAntiMatterTuplesBulkLoadTest.java | 10 +-
.../LSMRTreeWithAntiMatterTuplesDeleteTest.java | 10 +-
.../LSMRTreeWithAntiMatterTuplesExamplesTest.java | 6 +-
.../LSMRTreeWithAntiMatterTuplesInsertTest.java | 10 +-
.../LSMRTreeWithAntiMatterTuplesLifecycleTest.java | 2 +-
.../LSMRTreeWithAntiMatterTuplesMergeTest.java | 10 +-
.../rtree/multithread/LSMRTreeMultiThreadTest.java | 11 +-
...SMRTreeWithAntiMatterTuplesMultiThreadTest.java | 6 +-
.../am/lsm/rtree/util/LSMRTreeTestContext.java | 38 ++-
.../am/lsm/rtree/util/LSMRTreeTestHarness.java | 7 +
.../LSMRTreeWithAntiMatterTuplesTestContext.java | 5 +-
191 files changed, 4952 insertions(+), 771 deletions(-)
diff --cc
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
index 90bc499966,9a8d9acab6..e06d40072b
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
@@@ -646,16 -643,11 +653,24 @@@ public class NCConfig extends Controlle
return appConfig.getInt(Option.ABORT_TASKS_TIMEOUT);
}
+ public int getStorageMaxColumnsInZerothSegment() {
+ return appConfig.getInt(Option.STORAGE_MAX_COLUMNS_IN_ZEROTH_SEGMENT);
+ }
+
+ public String getStoragePageZeroWriter() {
+ return appConfig.getString(Option.STORAGE_PAGE_ZERO_WRITER);
+ }
++
+ public long getLibraryMaxFileSize() {
+ return appConfig.getLong(Option.LIBRARY_MAX_FILE_SIZE);
+ }
+
+ public long getLibraryMaxExtractedSize() {
+ return appConfig.getLong(Option.LIBRARY_MAX_EXTRACTED_SIZE);
+ }
+
+ public int getLibraryMaxArchiveEntries() {
+ return appConfig.getInt(Option.LIBRARY_MAX_ARCHIVE_ENTRIES);
+ }
+
}
