This is an automated email from the ASF dual-hosted git repository.
michaelsembwever pushed a change to branch cassandra-6.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 778d73de70 Merge branch 'cassandra-5.0' into cassandra-6.0
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
No new revisions were added by this update.
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 | 19 +++
.../org/apache/cassandra/db/memtable/Memtable.java | 50 ++++++-
.../db/memtable/ShardedSkipListMemtable.java | 2 +
.../cassandra/service/accord/AccordKeyspace.java | 2 +-
.../cassandra/utils/memory/MemtableAllocator.java | 67 +++++----
.../cassandra/utils/memory/MemtablePool.java | 36 ++---
.../cassandra/config/DatabaseDescriptorTest.java | 45 ++++++
.../cassandra/db/NestedMemtableWriteTest.java | 141 +++++++++++++++++++
.../memory/MemtableAllocatorAwaitRoomTest.java | 122 ++++++++++++++++
.../utils/memory/NativeAllocatorTest.java | 11 +-
.../memory/TrieMemtableShardLockDeadlockTest.java | 153 +++++++++++++++++++++
17 files changed, 667 insertions(+), 80 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]
