This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 7ca806c60a Change trunk from 4.2 to 5.0 new 40f9ca60f1 Improve memtable allocator accounting when updating AtomicBTreePartition new 6adcff8f30 Merge branch 'cassandra-4.0' into cassandra-4.1 new 0bed1967fd Merge branch 'cassandra-4.1' into trunk The 3 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 + .../db/memtable/AbstractAllocatorMemtable.java | 12 +- .../db/partitions/AtomicBTreePartition.java | 19 - .../db/partitions/BTreePartitionUpdater.java | 14 +- .../org/apache/cassandra/db/rows/ArrayCell.java | 2 +- .../org/apache/cassandra/db/rows/BufferCell.java | 2 +- .../org/apache/cassandra/db/rows/ColumnData.java | 51 ++- .../cassandra/db/rows/ComplexColumnData.java | 4 +- .../org/apache/cassandra/db/rows/NativeCell.java | 19 +- .../org/apache/cassandra/utils/btree/BTree.java | 17 +- .../cassandra/utils/memory/MemtablePool.java | 2 +- ...AtomicBTreePartitionMemtableAccountingTest.java | 421 +++++++++++++++++++++ 12 files changed, 511 insertions(+), 53 deletions(-) create mode 100644 test/unit/org/apache/cassandra/db/partitions/AtomicBTreePartitionMemtableAccountingTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org