This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9b165c91bc4c49226b1118f103d3c75c90da7c6b
Merge: c5b2a37 5a6d52b
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Jul 7 12:33:11 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../cassandra/utils/memory/NativeAllocator.java | 33 ++++++----------------
.../cassandra/utils/memory/SlabAllocator.java | 31 ++++++--------------
3 files changed, 18 insertions(+), 47 deletions(-)
diff --cc CHANGES.txt
index d89d22b,a363005..72c05ff
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,10 @@@
-3.0.21
+3.11.7
+ * Fix cqlsh output when fetching all rows in batch mode (CASSANDRA-15905)
+ * Upgrade Jackson to 2.9.10 (CASSANDRA-15867)
+ * Fix CQL formatting of read command restrictions for slow query log
(CASSANDRA-15503)
+ * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
+Merged from 3.0:
+ * Avoid thread starvation, and improve compare-and-swap performance, in the
slab allocators (CASSANDRA-15922)
- * Fix broken KEYS 2i queries after DROP COMPACT STORAGE (CASSANDRA-15906)
* Add token to tombstone warning and error messages (CASSANDRA-15890)
* Fixed range read concurrency factor computation and capped as 10 times tpc
cores (CASSANDRA-15752)
* Catch exception on bootstrap resume and init native transport
(CASSANDRA-15863)
diff --cc src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
index 61e8407,3d4ec16..af8b750
--- a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
+++ b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
@@@ -215,14 -184,9 +215,9 @@@ public class NativeAllocator extends Me
* Offset for the next allocation, or the sentinel value -1
* which implies that the region is still uninitialized.
*/
- private AtomicInteger nextFreeOffset = new AtomicInteger(0);
+ private final AtomicInteger nextFreeOffset = new AtomicInteger(0);
/**
- * Total number of allocations satisfied from this buffer
- */
- private final AtomicInteger allocCount = new AtomicInteger();
-
- /**
* Create an uninitialized region. Note that memory is not allocated
yet, so
* this is cheap.
*
diff --cc src/java/org/apache/cassandra/utils/memory/SlabAllocator.java
index 1db4b7f,5a8ec18..f72a2c3
--- a/src/java/org/apache/cassandra/utils/memory/SlabAllocator.java
+++ b/src/java/org/apache/cassandra/utils/memory/SlabAllocator.java
@@@ -176,14 -169,9 +176,9 @@@ public class SlabAllocator extends Memt
* Offset for the next allocation, or the sentinel value -1
* which implies that the region is still uninitialized.
*/
- private AtomicInteger nextFreeOffset = new AtomicInteger(0);
+ private final AtomicInteger nextFreeOffset = new AtomicInteger(0);
/**
- * Total number of allocations satisfied from this buffer
- */
- private final AtomicInteger allocCount = new AtomicInteger();
-
- /**
* Create an uninitialized region. Note that memory is not allocated
yet, so
* this is cheap.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
