This is an automated email from the ASF dual-hosted git repository.
netudima pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 79a8286d72 Merge branch 'cassandra-6.0' into trunk
add 52ff1c1f4e Fix memtable on-heap accounting drift in BTree.update and
BTreeRow.merge
add 0f856c5967 Merge branch 'cassandra-4.0' into cassandra-4.1
add 4b445a8ccf Merge branch 'cassandra-4.1' into cassandra-5.0
add 20c4f84c2b Merge branch 'cassandra-5.0' into cassandra-6.0
new 6c27ece145 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 +
src/java/org/apache/cassandra/db/Columns.java | 2 +-
.../org/apache/cassandra/db/rows/BTreeRow.java | 16 +-
.../org/apache/cassandra/db/rows/ColumnData.java | 25 +-
.../cassandra/db/rows/ComplexColumnData.java | 12 +-
.../org/apache/cassandra/utils/btree/BTree.java | 100 ++--
.../cassandra/utils/btree/UpdateFunction.java | 2 +-
.../db/partitions/PartitionRowAccountingTest.java | 504 +++++++++++++++++++++
.../db/partitions/SetCellAccountingTest.java | 171 +++++++
.../utils/btree/BTreeUpdateHeapAccountingTest.java | 276 +++++++++++
10 files changed, 1065 insertions(+), 44 deletions(-)
create mode 100644
test/unit/org/apache/cassandra/db/partitions/PartitionRowAccountingTest.java
create mode 100644
test/unit/org/apache/cassandra/db/partitions/SetCellAccountingTest.java
create mode 100644
test/unit/org/apache/cassandra/utils/btree/BTreeUpdateHeapAccountingTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
