cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Date Sun, 01 Aug 2021 13:55:53 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 8c406b259be0ae1511f697fdf687f6d1cbec000e
Merge: d319352 f575eea
Author: Mick Semb Wever <mck@apache.org>
AuthorDate: Sun Aug 1 15:42:12 2021 +0200

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt                                        |  1 +
 .../cassandra/db/commitlog/CommitLogSegment.java   |  2 ++
 .../org/apache/cassandra/hints/HintsBuffer.java    | 37 ++++++++++------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --cc CHANGES.txt
index 0f71a20,89610c0..e9626a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,11 +1,12 @@@
 -3.11.12
 +4.0.1
 + * Improve help, doc and error messages about sstabledump -k and -x arguments (CASSANDRA-16818)
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
 +Merged from 3.11:
+  * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
 -Merged from 3.0:
 - * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
 - * Remove mutation data from error log message (CASSANDRA-16817)
 -
 -
 -3.11.11
   * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663)
   * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
   * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 5303de9,af25b4a..7c80b94
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@@ -27,9 -26,9 +27,10 @@@ import java.util.*
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.concurrent.locks.LockSupport;
  import java.util.zip.CRC32;
  
 +import com.google.common.annotations.VisibleForTesting;
  import org.cliffc.high_scale_lib.NonBlockingHashMap;
  
  import com.codahale.metrics.Timer;

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message