Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88229a47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88229a47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88229a47 Branch: refs/heads/trunk Commit: 88229a47a847532d04041047d2db40411d04f49b Parents: 0e9d6bf 0a0e97d Author: Sam Tunnicliffe <s...@beobal.com> Authored: Mon Jun 20 14:19:27 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Mon Jun 20 14:19:27 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 123 +++---------------- .../org/apache/cassandra/transport/Server.java | 22 ++-- 3 files changed, 36 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a0f7c56,7873742..d09cd5a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,7 +1,24 @@@ -3.0.8 +3.8 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Add TimeWindowCompactionStrategy (CASSANDRA-9666) Merged from 2.2: + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038) * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) Merged from 2.1: * Cache local ranges when calculating repair neighbors (CASSANDRA-11934) http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 334d251,394220d..dda2320 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -28,22 -24,11 +24,13 @@@ import java.net.UnknownHostException import java.nio.ByteBuffer; import java.util.*; import java.util.Map.Entry; - import java.util.concurrent.CopyOnWriteArrayList; - import java.util.concurrent.ExecutionException; - import java.util.concurrent.ExecutorService; - import java.util.concurrent.Future; - import java.util.concurrent.FutureTask; - import java.util.concurrent.TimeUnit; - import java.util.concurrent.TimeoutException; + import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.MatchResult; +import java.util.regex.Pattern; import javax.annotation.Nullable; - import javax.management.JMX; - import javax.management.MBeanServer; - import javax.management.NotificationBroadcasterSupport; - import javax.management.ObjectName; + import javax.management.*; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
