This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1f90c9eb3d2063771f402450b6886f26afd81222
Merge: 4c85c6a403 29c0ad80c9
Author: Josh McKenzie <jmcken...@apache.org>
AuthorDate: Tue Sep 20 12:57:51 2022 -0400
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
.../org/apache/cassandra/repair/asymmetric/RangeMap.java | 10 ++++++----
.../apache/cassandra/repair/asymmetric/RangeMapTest.java | 14 ++++++++++++--
3 files changed, 19 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index afaf5d8acf,22bebd6e88..7e164257ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
+4.1-alpha2
+ * We should not emit deprecation warning on startup for
`key_cache_save_period`, `row_cache_save_period`, `counter_cache_save_period`
(CASSANDRA-17904)
+ * upsert with adder support is not consistent with numbers and strings in
LWT (CASSANDRA-17857)
+ * Fix race and return after failing connections (CASSANDRA-17618)
+ * Speculative execution threshold unit mismatch (CASSANDRA-17877)
+ * Fix BulkLoader to load entireSSTableThrottle and
entireSSTableInterDcThrottle (CASSANDRA-17677)
+ * Fix a race condition where a keyspace can be oopened while it is being
removed (CASSANDRA-17658)
+ * DatabaseDescriptor will set the default failure detector during client
initialization (CASSANDRA-17782)
+ * Avoid initializing schema via SystemKeyspace.getPreferredIP() with the
BulkLoader tool (CASSANDRA-17740)
+ * Uncomment prepared_statements_cache_size, key_cache_size,
counter_cache_size, index_summary_capacity which were
+ commented out by mistake in a previous patch
+ Fix breaking change with cache_load_timeout; cache_load_timeout_seconds
<=0 and cache_load_timeout=0 are equivalent
+ and they both mean disabled
+ Deprecate public method setRate(final double throughputMbPerSec) in
Compaction Manager in favor of
+ setRateInBytes(final double throughputBytesPerSec)
+ Revert breaking change removal of
StressCQLSSTableWriter.Builder.withBufferSizeInMB(int size). Deprecate it in
favor
+ of StressCQLSSTableWriter.Builder.withBufferSizeInMiB(int size)
+ Fix precision issues, add new -m flag (for nodetool/setstreamthroughput,
nodetool/setinterdcstreamthroughput,
+ nodetool/getstreamthroughput and nodetoo/getinterdcstreamthroughput), add
new -d flags (nodetool/getstreamthroughput,
nodetool/getinterdcstreamthroughput, nodetool/getcompactionthroughput)
+ Fix a bug with precision in nodetool/compactionstats
+ Deprecate StorageService methods and add new ones for
stream_throughput_outbound, inter_dc_stream_throughput_outbound,
+ compaction_throughput_outbound in the JMX MBean
`org.apache.cassandra.db:type=StorageService`
+ Removed getEntireSSTableStreamThroughputMebibytesPerSec in favor of new
getEntireSSTableStreamThroughputMebibytesPerSecAsDouble
+ in the JMX MBean `org.apache.cassandra.db:type=StorageService`
+ Removed getEntireSSTableInterDCStreamThroughputMebibytesPerSec in favor of
getEntireSSTableInterDCStreamThroughputMebibytesPerSecAsDouble
+ in the JMX MBean `org.apache.cassandra.db:type=StorageService`
(CASSANDRA-17725)
+ * Fix sstable_preemptive_open_interval disabled value.
sstable_preemptive_open_interval = null backward compatible with
+ sstable_preemptive_open_interval_in_mb = -1 (CASSANDRA-17737)
+ * Remove usages of Path#toFile() in the snapshot apparatus (CASSANDRA-17769)
+ * Fix Settings Virtual Table to update paxos_variant after startup and
rename enable_uuid_sstable_identifiers to
+ uuid_sstable_identifiers_enabled as per our config naming conventions
(CASSANDRA-17738)
+ * index_summary_resize_interval_in_minutes = -1 is equivalent to
index_summary_resize_interval being set to null or
+ disabled. JMX MBean IndexSummaryManager, setResizeIntervalInMinutes method
still takes resizeIntervalInMinutes = -1 for disabled (CASSANDRA-17735)
+ * min_tracked_partition_size_bytes parameter from 4.1 alpha1 was renamed to
min_tracked_partition_size (CASSANDRA-17733)
+ * Remove commons-lang dependency during build runtime (CASSANDRA-17724)
+ * Relax synchronization on StreamSession#onError() to avoid deadlock
(CASSANDRA-17706)
+ * Fix AbstractCell#toString throws MarshalException for cell in collection
(CASSANDRA-17695)
+ * Add new vtable output option to compactionstats (CASSANDRA-17683)
+ * Fix commitLogUpperBound initialization in AbstractMemtableWithCommitlog
(CASSANDRA-17587)
+ * Fix widening to long in getBatchSizeFailThreshold (CASSANDRA-17650)
+ * Fix widening from mebibytes to bytes in IntMebibytesBound (CASSANDRA-17716)
+ * Revert breaking change in nodetool clientstats and expose cient options
through nodetool clientstats --client-options. (CASSANDRA-17715)
+ * Fix missed nowInSec values in QueryProcessor (CASSANDRA-17458)
+ * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder
class and deprecate it in favor of withBufferSizeInMiB(int size)
(CASSANDRA-17675)
+ * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
+Merged from 4.0:
4.0.7
+ * Fix repair failure on assertion if two peers have overlapping mismatching
ranges (CASSANDRA-17900)
* Better handle null state in Gossip schema migration to avoid NPE
(CASSANDRA-17864)
* HintedHandoffAddRemoveNodesTest now accounts for the fact that
StorageMetrics.totalHints is not updated synchronously w/ writes
(CASSANDRA-16679)
* Avoid getting hanging repairs due to repair message timeouts
(CASSANDRA-17613)
diff --cc test/unit/org/apache/cassandra/repair/asymmetric/RangeMapTest.java
index 40ac7d6271,a4327caa01..04d7cc4b74
--- a/test/unit/org/apache/cassandra/repair/asymmetric/RangeMapTest.java
+++ b/test/unit/org/apache/cassandra/repair/asymmetric/RangeMapTest.java
@@@ -31,8 -31,9 +31,9 @@@ import org.apache.cassandra.dht.Murmur3
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+ import static org.junit.Assert.assertTrue;
public class RangeMapTest
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
