This is an automated email from the ASF dual-hosted git repository.
michaelsembwever pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from d2fa1a85e9 Merge branch 'cassandra-6.0' into trunk
add 2152f78dba Separate memtable memory usage tracking from limit checking
add 9c0491dd78 Merge branch 'cassandra-4.0' into cassandra-4.1
add 40bbd1c546 Merge branch 'cassandra-4.1' into cassandra-5.0
add 18e1ab3701 Merge branch 'cassandra-5.0' into cassandra-6.0
new aa971bc008 Merge branch 'cassandra-6.0' into trunk
The 1 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:
CHANGES.txt | 1 +
NEWS.txt | 3 +
conf/cassandra.yaml | 3 +
.../cassandra/config/DatabaseDescriptor.java | 43 ++++--
.../apache/cassandra/db/CassandraWriteContext.java | 31 +++++
.../org/apache/cassandra/db/ColumnFamilyStore.java | 18 ++-
.../db/memtable/AbstractAllocatorMemtable.java | 27 +++-
.../org/apache/cassandra/db/memtable/Memtable.java | 52 +++++--
.../db/memtable/ShardedSkipListMemtable.java | 4 +-
.../cassandra/db/memtable/SkipListMemtable.java | 2 +-
.../apache/cassandra/db/memtable/TrieMemtable.java | 4 +-
.../db/partitions/BTreePartitionUpdater.java | 2 +-
.../cassandra/index/accord/RouteJournalIndex.java | 3 +-
.../cassandra/index/sai/StorageAttachedIndex.java | 18 +--
.../org/apache/cassandra/index/sasi/SASIIndex.java | 8 +-
.../cassandra/service/accord/AccordKeyspace.java | 2 +-
.../apache/cassandra/utils/memory/HeapPool.java | 8 +-
.../cassandra/utils/memory/MemtableAllocator.java | 72 +++++-----
.../utils/memory/MemtableBufferAllocator.java | 4 +-
.../cassandra/utils/memory/MemtablePool.java | 36 ++---
.../cassandra/utils/memory/NativeAllocator.java | 4 +-
.../cassandra/utils/memory/SlabAllocator.java | 2 +-
.../cassandra/config/DatabaseDescriptorTest.java | 45 ++++++
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 4 +-
.../cassandra/db/NestedMemtableWriteTest.java | 141 +++++++++++++++++++
.../memory/MemtableAllocatorAwaitRoomTest.java | 120 ++++++++++++++++
.../utils/memory/NativeAllocatorTest.java | 17 ++-
.../memory/TrieMemtableShardLockDeadlockTest.java | 153 +++++++++++++++++++++
28 files changed, 700 insertions(+), 127 deletions(-)
create mode 100644
test/unit/org/apache/cassandra/db/NestedMemtableWriteTest.java
create mode 100644
test/unit/org/apache/cassandra/utils/memory/MemtableAllocatorAwaitRoomTest.java
create mode 100644
test/unit/org/apache/cassandra/utils/memory/TrieMemtableShardLockDeadlockTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
