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

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


    from e08a7049ad Merge branch 'cassandra-3.11' into cassandra-4.0
     add c56ba3b317 Improve accuracy of memtable heap usage tracking

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                        |   1 +
 src/java/org/apache/cassandra/db/Columns.java      |   2 +-
 src/java/org/apache/cassandra/db/Memtable.java     |  28 ++-
 .../db/partitions/AtomicBTreePartition.java        |   2 +
 .../org/apache/cassandra/utils/btree/BTree.java    |   3 +
 .../apache/cassandra/cql3/MemtableSizeTest.java    | 137 --------------
 .../MemtableSizeHeapBuffersTest.java}              |  30 ++--
 .../MemtableSizeOffheapBuffersTest.java}           |  30 ++--
 .../MemtableSizeOffheapObjectsTest.java}           |  29 +--
 .../db/memtable/MemtableSizeTestBase.java          | 198 +++++++++++++++++++++
 .../MemtableSizeUnslabbedTest.java}                |  29 +--
 11 files changed, 295 insertions(+), 194 deletions(-)
 delete mode 100644 test/unit/org/apache/cassandra/cql3/MemtableSizeTest.java
 copy test/unit/org/apache/cassandra/db/{commitlog/GroupCommitLogTest.java => 
memtable/MemtableSizeHeapBuffersTest.java} (52%)
 copy test/unit/org/apache/cassandra/db/{commitlog/GroupCommitLogTest.java => 
memtable/MemtableSizeOffheapBuffersTest.java} (52%)
 copy test/unit/org/apache/cassandra/db/{commitlog/GroupCommitLogTest.java => 
memtable/MemtableSizeOffheapObjectsTest.java} (54%)
 create mode 100644 
test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
 copy test/unit/org/apache/cassandra/db/{commitlog/GroupCommitLogTest.java => 
memtable/MemtableSizeUnslabbedTest.java} (54%)


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

Reply via email to