This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 1e19887f72 Merge branch 'cassandra-5.0' into trunk new 655a2455ac Reduce size of per-SSTable index components for SAI new 49e04e8df2 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/parent-pom-template.xml | 4 +- CHANGES.txt | 1 + .../config/CassandraRelevantProperties.java | 10 + .../apache/cassandra/index/sai/SSTableContext.java | 2 +- .../index/sai/StorageAttachedIndexGroup.java | 4 +- .../index/sai/disk/PerSSTableIndexWriter.java | 4 + .../cassandra/index/sai/disk/RowMapping.java | 11 +- .../index/sai/disk/StorageAttachedIndexWriter.java | 10 + .../index/sai/disk/format/IndexComponent.java | 22 +- .../index/sai/disk/format/IndexDescriptor.java | 68 +++- .../index/sai/disk/format/OnDiskFormat.java | 8 +- .../index/sai/disk/io/IndexFileUtils.java | 12 +- .../cassandra/index/sai/disk/v1/LongArray.java | 15 + .../index/sai/disk/v1/PerColumnIndexFiles.java | 8 +- .../index/sai/disk/v1/RowAwarePrimaryKeyMap.java | 201 ---------- .../index/sai/disk/v1/SSTableComponentsWriter.java | 66 +++- .../index/sai/disk/v1/SkinnyPrimaryKeyMap.java | 208 +++++++++++ .../index/sai/disk/v1/V1OnDiskFormat.java | 43 ++- .../index/sai/disk/v1/WidePrimaryKeyMap.java | 179 +++++++++ .../sai/disk/v1/bbtree/NumericIndexWriter.java | 2 +- .../disk/v1/bitpack/AbstractBlockPackedReader.java | 166 +++++++++ .../sai/disk/v1/bitpack/NumericValuesWriter.java | 30 +- .../index/sai/disk/v1/keystore/KeyLookup.java | 377 +++++++++++++++++++ .../KeyLookupMeta.java} | 27 +- .../index/sai/disk/v1/keystore/KeyStoreWriter.java | 218 +++++++++++ .../index/sai/disk/v1/postings/PostingsReader.java | 6 + .../sai/disk/v1/sortedterms/SortedTermsMeta.java | 48 --- .../sai/disk/v1/sortedterms/SortedTermsReader.java | 234 ------------ .../sai/disk/v1/sortedterms/SortedTermsWriter.java | 214 ----------- .../sai/disk/v1/sortedterms/package-info.java | 58 --- .../index/sai/disk/v1/trie/TriePrefixSearcher.java | 98 ----- .../sai/iterators/KeyRangeConcatIterator.java | 3 +- .../cassandra/index/sai/utils/PrimaryKey.java | 98 +++-- .../distributed/test/sai/IndexStreamingTest.java | 30 +- .../test/microbench/sai/KeyLookupBench.java | 205 ++++++++++ .../org/apache/cassandra/index/sai/SAITester.java | 2 +- .../index/sai/cql/StorageAttachedIndexDDLTest.java | 12 +- .../index/sai/cql/TokenCollisionTest.java | 120 ++++++ .../cassandra/index/sai/disk/NodeStartupTest.java | 2 +- .../index/sai/disk/v1/SegmentFlushTest.java | 6 +- .../index/sai/disk/v1/TermsReaderTest.java | 8 +- .../index/sai/disk/v1/WideRowPrimaryKeyTest.java | 115 ++++++ .../BlockBalancedTreePostingsWriterTest.java | 6 +- .../v1/bbtree/BlockBalancedTreeReaderTest.java | 4 +- .../sai/disk/v1/bbtree/NumericIndexWriterTest.java | 8 +- .../sai/disk/v1/bitpack/NumericValuesTest.java | 6 +- .../index/sai/disk/v1/keystore/KeyLookupTest.java | 413 ++++++++++++++++++++ .../sai/disk/v1/sortedterms/SortedTermsTest.java | 415 --------------------- .../sai/disk/v1/trie/TriePrefixSearcherTest.java | 160 -------- .../sai/disk/v1/trie/TrieTermsDictionaryTest.java | 6 +- .../index/sai/disk/v1/trie/TrieValidationTest.java | 93 ----- .../index/sai/functional/GroupComponentsTest.java | 6 +- .../sai/iterators/KeyRangeConcatIteratorTest.java | 22 +- .../index/sai/metrics/IndexGroupMetricsTest.java | 4 +- .../index/sai/utils/AbstractPrimaryKeyTester.java | 36 +- .../cassandra/index/sai/utils/PrimaryKeyTest.java | 42 +-- .../index/sai/utils/SAIRandomizedTester.java | 21 +- 57 files changed, 2417 insertions(+), 1780 deletions(-) delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java create mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java create mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java create mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java copy src/java/org/apache/cassandra/index/sai/disk/v1/{bitpack/NumericValuesMeta.java => keystore/KeyLookupMeta.java} (61%) create mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsMeta.java delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsReader.java delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsWriter.java delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/package-info.java delete mode 100644 src/java/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcher.java create mode 100644 test/microbench/org/apache/cassandra/test/microbench/sai/KeyLookupBench.java create mode 100644 test/unit/org/apache/cassandra/index/sai/cql/TokenCollisionTest.java create mode 100644 test/unit/org/apache/cassandra/index/sai/disk/v1/WideRowPrimaryKeyTest.java create mode 100644 test/unit/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookupTest.java delete mode 100644 test/unit/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsTest.java delete mode 100644 test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcherTest.java delete mode 100644 test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TrieValidationTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org