This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 7214794 ninja fix CHANGES.txt new 0a1e900 Prevent unbounded number of pending flushing tasks; Add PendingFlushTasks metric (CASSANDRA-16261) Authored by Ekaterina Dimitrova; reviewed by Caleb Rackliffe and Andres de la Pena for CASSANDRA-16261 new 11cb810 Merge branch 'cassandra-3.0' into cassandra-3.11 new 1b4e1cc Merge branch 'cassandra-3.11' 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 + .../cassandra/concurrent/InfiniteLoopExecutor.java | 8 + .../cassandra/config/DatabaseDescriptor.java | 14 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 249 ++++++++++++--------- src/java/org/apache/cassandra/db/Memtable.java | 13 +- src/java/org/apache/cassandra/db/ReadCommand.java | 2 +- .../apache/cassandra/utils/memory/HeapPool.java | 2 +- .../cassandra/utils/memory/MemtableAllocator.java | 121 ++++++++-- .../{HeapAllocator.java => MemtableCleaner.java} | 35 ++- .../utils/memory/MemtableCleanerThread.java | 67 +++++- .../cassandra/utils/memory/MemtablePool.java | 35 ++- .../apache/cassandra/utils/memory/NativePool.java | 2 +- .../apache/cassandra/utils/memory/SlabPool.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 14 +- .../org/apache/cassandra/db/NativeCellTest.java | 16 +- .../utils/memory/MemtableCleanerThreadTest.java | 187 ++++++++++++++++ .../utils/memory/NativeAllocatorTest.java | 204 ++++++++++------- 17 files changed, 686 insertions(+), 286 deletions(-) copy src/java/org/apache/cassandra/utils/memory/{HeapAllocator.java => MemtableCleaner.java} (50%) create mode 100644 test/unit/org/apache/cassandra/utils/memory/MemtableCleanerThreadTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org