This is an automated email from the ASF dual-hosted git repository.
blambov pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 5f3e60cfd4 Merge branch 'cassandra-4.1' into trunk
new 49e0c61107 Further improves precision of memtable heap tracking
new 30641ea7b6 Provides the Trie interface with MemtableTrie implementation
new 562cb26010 MemtableTrie using multiple buffers
new 7c55c73825 Adds a trie-based memtable implementation
new 9074ee7ef8 Renames MemtableTrie to InMemoryTrie
The 5 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/cassandra-deps-template.xml | 4 +
.build/parent-pom-template.xml | 5 +
.circleci/config-2_1.yml | 51 +
.circleci/config-2_1.yml.high_res.patch | 8 +-
.circleci/config-2_1.yml.mid_res.patch | 36 +-
.circleci/config.yml | 246 ++++-
.circleci/config.yml.HIGHRES | 256 ++++-
.circleci/config.yml.LOWRES | 256 ++++-
.circleci/config.yml.MIDRES | 256 ++++-
.circleci/generate.sh | 1 +
CHANGES.txt | 2 +
NEWS.txt | 3 +
build.xml | 37 +-
.../config/CassandraRelevantProperties.java | 1 +
.../db/AbstractArrayClusteringPrefix.java | 3 +-
.../db/AbstractBufferClusteringPrefix.java | 13 +-
.../org/apache/cassandra/db/ArrayClustering.java | 5 +
.../org/apache/cassandra/db/BufferClustering.java | 4 +
.../apache/cassandra/db/BufferDecoratedKey.java | 6 +
.../org/apache/cassandra/db/ClusteringPrefix.java | 8 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 52 +-
src/java/org/apache/cassandra/db/Columns.java | 2 +-
src/java/org/apache/cassandra/db/DecoratedKey.java | 1 +
.../org/apache/cassandra/db/NativeClustering.java | 22 +-
.../apache/cassandra/db/NativeDecoratedKey.java | 6 +
.../db/memtable/AbstractAllocatorMemtable.java | 16 +-
.../cassandra/db/memtable/AbstractMemtable.java | 2 +
.../db/memtable/AbstractShardedMemtable.java | 103 ++
.../apache/cassandra/db/memtable/Memtable_API.md | 21 +-
.../cassandra/db/memtable/ShardBoundaries.java | 3 +-
.../db/memtable/ShardedMemtableConfigMXBean.java | 30 +-
.../db/memtable/ShardedSkipListMemtable.java | 58 +-
.../cassandra/db/memtable/SkipListMemtable.java | 31 +-
.../apache/cassandra/db/memtable/TrieMemtable.java | 722 ++++++++++++++
.../db/partitions/AbstractBTreePartition.java | 78 +-
.../db/partitions/AtomicBTreePartition.java | 261 ++---
.../db/partitions/BTreePartitionData.java | 101 ++
.../db/partitions/BTreePartitionUpdater.java | 184 ++++
.../db/partitions/CachedBTreePartition.java | 6 +-
.../db/partitions/ImmutableBTreePartition.java | 8 +-
.../cassandra/db/partitions/PartitionUpdate.java | 32 +-
.../cassandra/db/tries/CollectionMergeTrie.java | 363 +++++++
.../cassandra/db/tries/InMemoryReadTrie.java | 920 ++++++++++++++++++
.../apache/cassandra/db/tries/InMemoryTrie.java | 1028 ++++++++++++++++++++
.../org/apache/cassandra/db/tries/InMemoryTrie.md | 753 ++++++++++++++
.../cassandra/db/tries/InMemoryTrie.md.a1.svg | 599 ++++++++++++
.../cassandra/db/tries/InMemoryTrie.md.g1.svg | 76 ++
.../cassandra/db/tries/InMemoryTrie.md.g2.svg | 116 +++
.../cassandra/db/tries/InMemoryTrie.md.g3.svg | 253 +++++
.../cassandra/db/tries/InMemoryTrie.md.g4.svg | 290 ++++++
.../cassandra/db/tries/InMemoryTrie.md.m1.svg | 349 +++++++
.../cassandra/db/tries/InMemoryTrie.md.m2.svg | 430 ++++++++
.../cassandra/db/tries/InMemoryTrie.md.m3.svg | 500 ++++++++++
.../cassandra/db/tries/InMemoryTrie.md.p1.svg | 405 ++++++++
.../cassandra/db/tries/InMemoryTrie.md.w1.svg | 226 +++++
.../cassandra/db/tries/InMemoryTrie.md.w2.svg | 326 +++++++
.../cassandra/db/tries/InMemoryTrie.md.w3.svg | 269 +++++
.../cassandra/db/tries/InMemoryTrie.md.wc1.svg | 349 +++++++
.../cassandra/db/tries/InMemoryTrie.md.wc2.svg | 314 ++++++
.../org/apache/cassandra/db/tries/MergeTrie.java | 166 ++++
.../apache/cassandra/db/tries/SingletonTrie.java | 109 +++
.../org/apache/cassandra/db/tries/SlicedTrie.java | 242 +++++
src/java/org/apache/cassandra/db/tries/Trie.java | 622 ++++++++++++
src/java/org/apache/cassandra/db/tries/Trie.md | 252 +++++
.../org/apache/cassandra/db/tries/TrieDumper.java | 93 ++
.../cassandra/db/tries/TrieEntriesIterator.java | 86 ++
.../cassandra/db/tries/TrieEntriesWalker.java | 62 ++
.../cassandra/db/tries/TriePathReconstructor.java | 56 ++
.../cassandra/db/tries/TrieValuesIterator.java | 48 +-
.../io/sstable/metadata/MetadataCollector.java | 8 +-
.../apache/cassandra/metrics/MinMaxAvgMetric.java | 106 ++
.../cassandra/metrics/TrieMemtableMetricsView.java | 90 ++
.../org/apache/cassandra/utils/ByteBufferUtil.java | 5 +-
.../org/apache/cassandra/utils/ObjectSizes.java | 13 +
.../org/apache/cassandra/utils/btree/BTree.java | 3 +
.../utils/bytecomparable/ByteComparable.md | 1 +
.../cassandra/utils/memory/EnsureOnHeap.java | 2 +
.../apache/cassandra/utils/memory/HeapPool.java | 6 +-
test/conf/cassandra.yaml | 11 +-
test/conf/trie_memtable.yaml | 20 +
.../btree/AtomicBTreePartitionUpdateBench.java | 15 +-
.../test/microbench/instance/ReadTest.java | 10 +
.../test/microbench/tries/ComparisonReadBench.java | 517 ++++++++++
.../microbench/tries/InMemoryTrieReadBench.java | 183 ++++
.../microbench/tries/InMemoryTrieUnionBench.java | 146 +++
.../microbench/tries/InMemoryTrieWriteBench.java | 121 +++
.../apache/cassandra/cql3/MemtableSizeTest.java | 157 ---
.../cql3/validation/operations/AlterTest.java | 17 +-
.../cql3/validation/operations/CreateTest.java | 5 +-
.../cassandra/db/ClusteringHeapSizeTest.java | 16 +
.../apache/cassandra/db/ClusteringPrefixTest.java | 234 +++++
.../{cql3 => db/memtable}/MemtableQuickTest.java | 7 +-
.../MemtableSizeHeapBuffersTest.java} | 32 +-
.../MemtableSizeOffheapBuffersTest.java} | 33 +-
.../MemtableSizeOffheapObjectsTest.java} | 31 +-
.../db/memtable/MemtableSizeTestBase.java | 206 ++++
.../MemtableSizeUnslabbedTest.java} | 31 +-
.../db/memtable/ShardedMemtableConfigTest.java | 68 ++
.../db/tries/CollectionMergeTrieTest.java | 207 ++++
.../tries/InMemoryTrieApplyTest.java} | 21 +-
.../cassandra/db/tries/InMemoryTriePutTest.java | 125 +++
.../cassandra/db/tries/InMemoryTrieTestBase.java | 631 ++++++++++++
.../db/tries/InMemoryTrieThreadedTest.java | 161 +++
.../apache/cassandra/db/tries/MergeTrieTest.java | 99 ++
.../apache/cassandra/db/tries/SlicedTrieTest.java | 527 ++++++++++
.../org/apache/cassandra/db/tries/TrieToDot.java | 123 +++
.../apache/cassandra/db/tries/TrieToDotTest.java | 41 +
.../cassandra/io/sstable/SSTableMetadataTest.java | 44 +-
.../cassandra/metrics/TrieMemtableMetricsTest.java | 210 ++++
.../org/apache/cassandra/tools/BulkLoaderTest.java | 12 +-
.../org/apache/cassandra/tools/GetVersionTest.java | 2 +-
.../apache/cassandra/tools/OfflineToolUtils.java | 24 +-
.../tools/SSTableExpiredBlockersTest.java | 2 +-
.../tools/SSTableExportSchemaLoadingTest.java | 2 +-
.../apache/cassandra/tools/SSTableExportTest.java | 2 +-
.../cassandra/tools/SSTableLevelResetterTest.java | 2 +-
.../cassandra/tools/SSTableMetadataViewerTest.java | 4 +-
.../cassandra/tools/SSTableOfflineRelevelTest.java | 2 +-
.../tools/SSTableRepairedAtSetterTest.java | 8 +-
.../cassandra/tools/ToolsSchemaLoadingTest.java | 10 +-
120 files changed, 15816 insertions(+), 779 deletions(-)
create mode 100644
src/java/org/apache/cassandra/db/memtable/AbstractShardedMemtable.java
copy test/unit/org/apache/cassandra/tools/GetVersionTest.java =>
src/java/org/apache/cassandra/db/memtable/ShardedMemtableConfigMXBean.java (60%)
create mode 100644 src/java/org/apache/cassandra/db/memtable/TrieMemtable.java
create mode 100644
src/java/org/apache/cassandra/db/partitions/BTreePartitionData.java
create mode 100644
src/java/org/apache/cassandra/db/partitions/BTreePartitionUpdater.java
create mode 100644
src/java/org/apache/cassandra/db/tries/CollectionMergeTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/InMemoryReadTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/InMemoryTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/InMemoryTrie.md
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.a1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.g1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.g2.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.g3.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.g4.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.m1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.m2.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.m3.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.p1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.w1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.w2.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.w3.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.wc1.svg
create mode 100644
src/java/org/apache/cassandra/db/tries/InMemoryTrie.md.wc2.svg
create mode 100644 src/java/org/apache/cassandra/db/tries/MergeTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/SingletonTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/SlicedTrie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/Trie.java
create mode 100644 src/java/org/apache/cassandra/db/tries/Trie.md
create mode 100644 src/java/org/apache/cassandra/db/tries/TrieDumper.java
create mode 100644
src/java/org/apache/cassandra/db/tries/TrieEntriesIterator.java
create mode 100644
src/java/org/apache/cassandra/db/tries/TrieEntriesWalker.java
create mode 100644
src/java/org/apache/cassandra/db/tries/TriePathReconstructor.java
copy test/unit/org/apache/cassandra/db/ClusteringBoundTest.java =>
src/java/org/apache/cassandra/db/tries/TrieValuesIterator.java (53%)
create mode 100644 src/java/org/apache/cassandra/metrics/MinMaxAvgMetric.java
create mode 100644
src/java/org/apache/cassandra/metrics/TrieMemtableMetricsView.java
create mode 100644 test/conf/trie_memtable.yaml
create mode 100644
test/microbench/org/apache/cassandra/test/microbench/tries/ComparisonReadBench.java
create mode 100644
test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieReadBench.java
create mode 100644
test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieUnionBench.java
create mode 100644
test/microbench/org/apache/cassandra/test/microbench/tries/InMemoryTrieWriteBench.java
delete mode 100644 test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
create mode 100644 test/unit/org/apache/cassandra/db/ClusteringPrefixTest.java
rename test/unit/org/apache/cassandra/{cql3 =>
db/memtable}/MemtableQuickTest.java (95%)
copy test/unit/org/apache/cassandra/db/{ClusteringBoundTest.java =>
memtable/MemtableSizeHeapBuffersTest.java} (52%)
copy test/unit/org/apache/cassandra/db/{ClusteringBoundTest.java =>
memtable/MemtableSizeOffheapBuffersTest.java} (52%)
copy test/unit/org/apache/cassandra/db/{ClusteringBoundTest.java =>
memtable/MemtableSizeOffheapObjectsTest.java} (53%)
create mode 100644
test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
rename test/unit/org/apache/cassandra/db/{ClusteringBoundTest.java =>
memtable/MemtableSizeUnslabbedTest.java} (53%)
create mode 100644
test/unit/org/apache/cassandra/db/memtable/ShardedMemtableConfigTest.java
create mode 100644
test/unit/org/apache/cassandra/db/tries/CollectionMergeTrieTest.java
copy test/unit/org/apache/cassandra/{tools/GetVersionTest.java =>
db/tries/InMemoryTrieApplyTest.java} (60%)
create mode 100644
test/unit/org/apache/cassandra/db/tries/InMemoryTriePutTest.java
create mode 100644
test/unit/org/apache/cassandra/db/tries/InMemoryTrieTestBase.java
create mode 100644
test/unit/org/apache/cassandra/db/tries/InMemoryTrieThreadedTest.java
create mode 100644 test/unit/org/apache/cassandra/db/tries/MergeTrieTest.java
create mode 100644 test/unit/org/apache/cassandra/db/tries/SlicedTrieTest.java
create mode 100644 test/unit/org/apache/cassandra/db/tries/TrieToDot.java
create mode 100644 test/unit/org/apache/cassandra/db/tries/TrieToDotTest.java
create mode 100644
test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
