This is an automated email from the ASF dual-hosted git repository.

michaelsembwever pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from d035ff148f Merge branch 'cassandra-4.0' into cassandra-4.1
     add 2152f78dba Separate memtable memory usage tracking from limit checking
     add 9c0491dd78 Merge branch 'cassandra-4.0' into cassandra-4.1

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                        |   1 +
 .../cassandra/db/CassandraTableWriteHandler.java   |   9 ++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |  33 ++++-
 .../org/apache/cassandra/db/TableWriteHandler.java |   9 ++
 .../db/memtable/AbstractAllocatorMemtable.java     |  27 ++++
 .../org/apache/cassandra/db/memtable/Memtable.java |  15 ++
 .../db/memtable/ShardedSkipListMemtable.java       |   6 +-
 .../cassandra/db/memtable/SkipListMemtable.java    |   2 +-
 .../cassandra/index/internal/CassandraIndex.java   |   4 +-
 .../cassandra/utils/memory/MemtableAllocator.java  |  65 ++++----
 .../cassandra/utils/memory/MemtablePool.java       |  23 +--
 .../memory/MemtableAllocatorAwaitRoomTest.java     |  94 ++++++++++++
 .../memory/MemtableNestedPutSkipsRoomWaitTest.java | 164 +++++++++++++++++++++
 .../utils/memory/NativeAllocatorTest.java          |  11 +-
 14 files changed, 406 insertions(+), 57 deletions(-)
 create mode 100644 
test/unit/org/apache/cassandra/utils/memory/MemtableAllocatorAwaitRoomTest.java
 create mode 100644 
test/unit/org/apache/cassandra/utils/memory/MemtableNestedPutSkipsRoomWaitTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to