Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/465d8690 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/465d8690 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/465d8690 Branch: refs/heads/trunk Commit: 465d86904908b4d06cb4a3172dd5c6421ddef1b8 Parents: c494696 f88ec93 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 5 09:15:15 2018 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 5 09:15:15 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 11 +++--- .../org/apache/cassandra/utils/FBUtilities.java | 36 +++++++++++++++++++ .../apache/cassandra/utils/FBUtilitiesTest.java | 37 ++++++++++++++++++++ 4 files changed, 80 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 33d5da3,5599906..163d787 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,18 +1,44 @@@ -3.0.17 +3.11.3 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Fully utilise specified compaction threads (CASSANDRA-14210) * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763) -Merged from 2.1: - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) Merged from 2.2: * Backport circleci yaml (CASSANDRA-14240) +Merged from 2.1: + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) -3.0.16 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219) - * Add MinGW uname check to start scripts (CASSANDRA-12940) - * Protect against overflow of local expiration time (CASSANDRA-14092) + +3.11.2 + * Fix ReadCommandTest (CASSANDRA-14234) + * Remove trailing period from latency reports at keyspace level (CASSANDRA-14233) + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case as well (CASSANDRA-14212) + * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173) + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205) + * Add Unittest for schema migration fix (CASSANDRA-14140) + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528) + * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) + * Enable CDC unittest (CASSANDRA-14141) + * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139) + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143) + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083) + * Avoid exposing compaction strategy index externally (CASSANDRA-14082) + * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109) + * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084) + * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948) + * Remove OpenJDK log warning (CASSANDRA-13916) + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079) + * Cache disk boundaries (CASSANDRA-13215) + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) + * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) +Merged from 3.0: + * Add MinGW uname check to start scripts (CASSANDRA-12840) * Use the correct digest file and reload sstable metadata in nodetool verify (CASSANDRA-14217) * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933) - * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) * Set encoding for javadoc generation (CASSANDRA-14154) * Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104) * Improve commit log chain marker updating (CASSANDRA-14108) http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d8690/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java index b8d2633,c5126a0..0300b9d --- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java +++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java @@@ -23,17 -23,21 +23,24 @@@ import java.net.InetAddress import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.TreeMap; ++import java.util.ArrayList; ++import java.util.List; + import java.util.concurrent.ExecutionException; + import java.util.concurrent.ExecutorService; + import java.util.concurrent.Executors; + import java.util.concurrent.Future; + import java.util.concurrent.TimeUnit; import com.google.common.primitives.Ints; + +import org.junit.Assert; import org.junit.Test; -import java.util.Map; -import java.util.TreeMap; +import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.dht.*; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
