Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31501cc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31501cc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31501cc8 Branch: refs/heads/trunk Commit: 31501cc8b1f2b66dce4abc59891984ba790896b0 Parents: a8acb2a 3b84de4 Author: Benjamin Lerer <[email protected]> Authored: Mon Dec 12 14:09:46 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Mon Dec 12 14:10:13 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 +- doc/source/operating/metrics.rst | 25 ++++ .../cql3/statements/BatchStatement.java | 35 ++++-- src/java/org/apache/cassandra/db/IMutation.java | 16 +++ .../apache/cassandra/metrics/BatchMetrics.java | 38 ++++++ .../metrics/CASClientRequestMetrics.java | 5 - .../metrics/CASClientWriteRequestMetrics.java | 52 ++++++++ .../metrics/ClientWriteRequestMetrics.java | 47 ++++++++ .../apache/cassandra/service/StorageProxy.java | 16 ++- .../cassandra/metrics/BatchMetricsTest.java | 119 +++++++++++++++++++ 10 files changed, 336 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31501cc8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 18e0833,dfb849d..fa2bf93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +4.0 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + + 3.12 - * add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) * Fix primary index calculation for SASI (CASSANDRA-12910) * Expose time spent waiting in thread pool queue (CASSANDRA-8398) * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) http://git-wip-us.apache.org/repos/asf/cassandra/blob/31501cc8/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
