[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ca8f38e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ca8f38e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ca8f38e

Branch: refs/heads/cassandra-3.9
Commit: 2ca8f38efbb199d496527d6a8c5463c653df3e34
Parents: a592693 d0fc953
Author: Aleksey Yeschenko 
Authored: Tue Aug 23 13:32:35 2016 +0300
Committer: Aleksey Yeschenko 
Committed: Tue Aug 23 13:32:35 2016 +0300

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/service/MigrationManager.java | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca8f38e/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca8f38e/src/java/org/apache/cassandra/service/MigrationManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca8f38e/src/java/org/apache/cassandra/service/StorageService.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e72dc29e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e72dc29e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e72dc29e

Branch: refs/heads/cassandra-3.9
Commit: e72dc29e69ed21d15c70788cd2c2b620eeabeb6c
Parents: 903ac4d e6dd152
Author: Yuki Morishita 
Authored: Mon Aug 15 10:09:55 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Aug 15 10:09:55 2016 -0500

--
 .../apache/cassandra/streaming/messages/OutgoingFileMessage.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e72dc29e/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jasobrown]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/903ac4d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/903ac4d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/903ac4d4

Branch: refs/heads/cassandra-3.9
Commit: 903ac4d4f0944c17e6ec923ffd4cdcaee65eee8d
Parents: d597910 74ac3ce
Author: Jason Brown 
Authored: Sun Aug 14 08:45:15 2016 -0700
Committer: Jason Brown 
Committed: Sun Aug 14 08:45:25 2016 -0700

--
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/903ac4d4/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fff069a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fff069a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fff069a

Branch: refs/heads/cassandra-3.9
Commit: 1fff069ad90b33dcda6d231ca5e327758f844388
Parents: c3e636c 2691c9e
Author: T Jake Luciani 
Authored: Wed Aug 10 14:43:13 2016 -0400
Committer: T Jake Luciani 
Committed: Wed Aug 10 14:43:13 2016 -0400

--
 CHANGES.txt |   3 +
 .../metrics/CassandraMetricsRegistry.java   |   4 +-
 .../cassandra/metrics/ClearableHistogram.java   |   4 +-
 .../DecayingEstimatedHistogramReservoir.java| 549 +++
 .../metrics/EstimatedHistogramReservoir.java| 111 
 .../cassandra/utils/EstimatedHistogram.java |   2 +-
 ...DecayingEstimatedHistogramReservoirTest.java | 381 +
 7 files changed, 938 insertions(+), 116 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fff069a/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fff069a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8458e4e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8458e4e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8458e4e3

Branch: refs/heads/cassandra-3.9
Commit: 8458e4e30744e8df6fcbe12aec286db047411385
Parents: ee60941 62ef861
Author: Yuki Morishita 
Authored: Tue Aug 9 16:56:29 2016 -0500
Committer: Yuki Morishita 
Committed: Tue Aug 9 16:56:29 2016 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/Config.java |  4 ++
 .../cassandra/config/DatabaseDescriptor.java|  5 --
 .../cassandra/streaming/StreamReader.java   | 26 +-
 .../cassandra/streaming/StreamSession.java  | 36 +-
 .../compress/CompressedInputStream.java | 21 +++-
 .../compress/CompressedStreamReader.java| 10 ++--
 .../streaming/messages/IncomingFileMessage.java | 22 ++---
 .../streaming/messages/RetryMessage.java|  4 ++
 .../org/apache/cassandra/utils/Throwables.java  | 14 ++
 .../compression/CompressedInputStreamTest.java  | 52 +---
 11 files changed, 100 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8458e4e3/CHANGES.txt
--
diff --cc CHANGES.txt
index b7bbf72,f613c5f..8fbd774
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,47 -15,6 +22,48 @@@ Merged from 3.0
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
++ * Fix hanging stream session (CASSANDRA-10992)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
 +
 +
 +3.8
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static 

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55aea2db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55aea2db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55aea2db

Branch: refs/heads/cassandra-3.9
Commit: 55aea2db8029f55ccc730e85d01544caccf38746
Parents: 5a902ba 47e63fe
Author: Yuki Morishita 
Authored: Mon Aug 8 07:54:27 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Aug 8 07:54:27 2016 -0500

--

--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aab33f11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aab33f11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aab33f11

Branch: refs/heads/cassandra-3.9
Commit: aab33f1170c8dd53935910cead3df0a1d3deb61a
Parents: 4805108 1cce9eb
Author: T Jake Luciani 
Authored: Fri Aug 5 11:47:06 2016 -0400
Committer: T Jake Luciani 
Committed: Fri Aug 5 11:54:08 2016 -0400

--
 CHANGES.txt |  19 ++
 build.xml   |   2 +
 doc/source/operating/metrics.rst|  87 
 lib/licenses/metrics-jvm-3.1.0.txt  | 202 +++
 lib/metrics-jvm-3.1.0.jar   | Bin 0 -> 35907 bytes
 .../cassandra/service/CassandraDaemon.java  |  16 +-
 6 files changed, 325 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab33f11/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab33f11/build.xml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab33f11/doc/source/operating/metrics.rst
--
diff --cc doc/source/operating/metrics.rst
index 5884cad,000..6df1b71
mode 100644,00..100644
--- a/doc/source/operating/metrics.rst
+++ b/doc/source/operating/metrics.rst
@@@ -1,619 -1,0 +1,706 @@@
 +.. Licensed to the Apache Software Foundation (ASF) under one
 +.. or more contributor license agreements.  See the NOTICE file
 +.. distributed with this work for additional information
 +.. regarding copyright ownership.  The ASF licenses this file
 +.. to you under the Apache License, Version 2.0 (the
 +.. "License"); you may not use this file except in compliance
 +.. with the License.  You may obtain a copy of the License at
 +..
 +.. http://www.apache.org/licenses/LICENSE-2.0
 +..
 +.. Unless required by applicable law or agreed to in writing, software
 +.. distributed under the License is distributed on an "AS IS" BASIS,
 +.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +.. See the License for the specific language governing permissions and
 +.. limitations under the License.
 +
 +.. highlight:: none
 +
 +Monitoring
 +--
 +
 +Metrics in Cassandra are managed using the `Dropwizard Metrics 
`__ library. These metrics
 +can be queried via JMX or pushed to external monitoring systems using a 
number of `built in
 +`__ and 
`third party
 +`__ reporter plugins.
 +
 +Metrics are collected for a single node. It's up to the operator to use an 
external monitoring system to aggregate them.
 +
 +Metric Types
 +
 +All metrics reported by cassandra fit into one of the following types.
 +
 +``Gauge``
 +An instantaneous measurement of a value.
 +
 +``Counter``
 +A gauge for an ``AtomicLong`` instance. Typically this is consumed by 
monitoring the change since the last call to
 +see if there is a large increase compared to the norm.
 +
 +``Histogram``
 +Measures the statistical distribution of values in a stream of data.
 +
 +In addition to minimum, maximum, mean, etc., it also measures median, 
75th, 90th, 95th, 98th, 99th, and 99.9th
 +percentiles.
 +
 +``Timer``
 +Measures both the rate that a particular piece of code is called and the 
histogram of its duration.
 +
 +``Latency``
 +Special type that tracks latency (in microseconds) with a ``Timer`` plus 
a ``Counter`` that tracks the total latency
 +accrued since starting. The former is useful if you track the change in 
total latency since the last check. Each
 +metric name of this type will have 'Latency' and 'TotalLatency' appended 
to it.
 +
 +``Meter``
 +A meter metric which measures mean throughput and one-, five-, and 
fifteen-minute exponentially-weighted moving
 +average throughputs.
 +
 +Table Metrics
 +^
 +
 +Each table in Cassandra has metrics responsible for tracking its state and 
performance.
 +
 +The metric names are all appended with the specific ``Keyspace`` and 
``Table`` name.
 +
 +Reported name format:
 +
 +**Metric Name**
 +
``org.apache.cassandra.metrics.Table.{{MetricName}}.{{Keyspace}}.{{Table}}``
 +
 +**JMX MBean**
 +``org.apache.cassandra.metrics:type=Table keyspace={{Keyspace} 
scope={{Table}} name={{MetricName}}``
 +
 +.. NOTE::
 +There is a special 

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e0ace7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e0ace7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e0ace7b

Branch: refs/heads/cassandra-3.9
Commit: 2e0ace7bca45a33e5b220660bebc6afbdbbd8e5c
Parents: 042e1f7 cc8f6cc
Author: Yuki Morishita 
Authored: Wed Aug 3 20:39:30 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Aug 3 20:39:30 2016 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/StreamSession.java  |  3 +-
 .../cassandra/streaming/StreamTransferTask.java |  4 +-
 .../streaming/messages/FileMessageHeader.java   | 20 +++--
 .../streaming/messages/OutgoingFileMessage.java | 38 -
 .../streaming/StreamTransferTaskTest.java   | 85 ++--
 6 files changed, 136 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e0ace7b/CHANGES.txt
--
diff --cc CHANGES.txt
index 31d9434,49733d3..dd04ddf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,45 -13,6 +18,46 @@@ Merged from 3.0
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
++ * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
 +
 +
 +3.8
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e0ace7b/src/java/org/apache/cassandra/streaming/StreamSession.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e0ace7b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[stefania]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/717c6d6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/717c6d6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/717c6d6b

Branch: refs/heads/trunk
Commit: 717c6d6bf8f9dc02a25dd064f1b7d70df8e8aa3d
Parents: 245fc2a f5c9d6e
Author: Stefania Alborghetti 
Authored: Wed Aug 3 11:01:57 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Aug 3 11:01:57 2016 +0800

--
 CHANGES.txt |  1 +
 .../compaction/BlacklistingCompactionsTest.java | 33 ++--
 2 files changed, 25 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c6d6b/CHANGES.txt
--
diff --cc CHANGES.txt
index 5647cd4,d78345a..bb58e77
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.9
 +3.9
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
   * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
   * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
   * Lost counter writes in compact table and static columns (CASSANDRA-12219)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c6d6b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 54579fb,6378e09..f08ea97
--- 
a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@@ -37,9 -37,9 +37,10 @@@ import static org.junit.Assert.assertNo
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.cache.ChunkCache;
  import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.marshal.LongType;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.apache.cassandra.io.util.FileUtils;

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[stefania]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e775eaa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e775eaa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e775eaa

Branch: refs/heads/cassandra-3.9
Commit: 8e775eaaf5ee6b355e050ea15f2e334eff680487
Parents: eebadcf 8868b74
Author: Stefania Alborghetti 
Authored: Fri Jul 29 15:29:51 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Jul 29 15:30:27 2016 +0800

--
 CHANGES.txt |  1 +
 bin/cqlsh.py|  2 +-
 .../cassandra/concurrent/StageManager.java  | 12 +--
 .../cassandra/tracing/ExpiredTraceState.java|  5 +++
 .../apache/cassandra/tracing/TraceState.java|  5 +++
 .../cassandra/tracing/TraceStateImpl.java   | 38 
 .../apache/cassandra/tracing/TracingTest.java   |  3 ++
 7 files changed, 63 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e775eaa/CHANGES.txt
--
diff --cc CHANGES.txt
index d6a9d16,bb67fc9..ca5b383
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,42 -10,6 +13,43 @@@ Merged from 3.0
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
++ * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 +
 +
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e775eaa/bin/cqlsh.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e775eaa/src/java/org/apache/cassandra/concurrent/StageManager.java
--
diff --cc src/java/org/apache/cassandra/concurrent/StageManager.java
index ebc4f76,a201e78..64abf00
--- a/src/java/org/apache/cassandra/concurrent/StageManager.java
+++ 

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[stefania]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9501c64f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9501c64f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9501c64f

Branch: refs/heads/cassandra-3.9
Commit: 9501c64f6db9bdfb098a3ffc4e87e5f7f3462009
Parents: 7ca3e28 659be5f
Author: Stefania Alborghetti 
Authored: Mon Jul 25 09:24:17 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Jul 25 09:24:17 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 10 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9501c64f/CHANGES.txt
--
diff --cc CHANGES.txt
index 298dd57,e9f41fb..5c27dc9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,40 -4,6 +7,41 @@@ Merged from 3.0
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
++ * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 +
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9501c64f/pylib/cqlshlib/copyutil.py
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[stefania]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8df6d4d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8df6d4d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8df6d4d4

Branch: refs/heads/cassandra-3.9
Commit: 8df6d4d4c60f865a09a93ff678ea5f6417465c29
Parents: 4bd4be8 dce4537
Author: Stefania Alborghetti 
Authored: Wed Jul 20 09:58:14 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jul 20 09:58:40 2016 +0800

--
 CHANGES.txt  |  2 ++
 pylib/cqlshlib/test/__init__.py  |  6 +++---
 pylib/cqlshlib/test/cassconnect.py   | 22 +++---
 pylib/cqlshlib/test/test_cqlsh_output.py | 14 +++---
 4 files changed, 23 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8df6d4d4/CHANGES.txt
--
diff --cc CHANGES.txt
index 780ea96,739c095..dac46ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,38 @@@
 -3.0.9
 +3.9
 +Merged from 3.0:
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
++Merged from 2.2:
++ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8df6d4d4/pylib/cqlshlib/test/test_cqlsh_output.py
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jmckenzie]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76188e95
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76188e95
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76188e95

Branch: refs/heads/cassandra-3.9
Commit: 76188e9520d0aed8da287cffd80122e1069ddcae
Parents: 56abaca e99ee19
Author: Josh McKenzie 
Authored: Mon Jul 11 16:29:58 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Jul 11 16:29:58 2016 -0400

--
 conf/cassandra.yaml   |  6 ++
 src/java/org/apache/cassandra/config/Config.java  |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java   | 10 ++
 src/java/org/apache/cassandra/service/GCInspector.java|  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 076a729,09d2094..d79423e
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1051,6 -924,16 +1051,12 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
+ # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+ # This threshold can be adjusted to minimize logging if necessary
+ # gc_log_threshold_in_ms: 200
+ 
 -# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+ # If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+ # INFO level
 -# Adjust the threshold based on your application throughput requirement
 -gc_warn_threshold_in_ms: 1000
 -
  # UDFs (user defined functions) are disabled by default.
  # As of Cassandra 3.0 there is a sandbox in place that should prevent 
execution of evil code.
  enable_user_defined_functions: false

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 1375a39,100bcf4..38dce11
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -2169,11 -1984,11 +2174,16 @@@ public class DatabaseDescripto
  conf.user_function_timeout_policy = userFunctionTimeoutPolicy;
  }
  
+ public static long getGCLogThreshold()
+ {
+ return conf.gc_log_threshold_in_ms;
+ }
+ 
 +public static EncryptionContext getEncryptionContext()
 +{
 +return encryptionContext;
 +}
 +
  public static long getGCWarnThreshold()
  {
  return conf.gc_warn_threshold_in_ms;

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56abaca0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56abaca0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56abaca0

Branch: refs/heads/cassandra-3.9
Commit: 56abaca0466411739895523d0c3a81a7630ab9f0
Parents: 371a147 5861cd8
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 15:00:33 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 15:01:04 2016 +0100

--
 CHANGES.txt| 7 +++
 src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/56abaca0/CHANGES.txt
--
diff --cc CHANGES.txt
index f65b1f4,70210a8..da8216f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,4 +1,9 @@@
 -3.0.9
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
- 3.0.9
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1417a516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1417a516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1417a516

Branch: refs/heads/cassandra-3.9
Commit: 1417a516cf7cc89dc456eb8c9c7e2759811a6991
Parents: c1dcc9c 2fa44cd
Author: Yuki Morishita 
Authored: Fri Jul 8 19:12:34 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Jul 8 19:12:34 2016 -0500

--
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1417a516/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8475f891
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8475f891
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8475f891

Branch: refs/heads/cassandra-3.9
Commit: 8475f891c7576e3816ac450178344a5232b72738
Parents: a006f57 a227cc6
Author: Yuki Morishita 
Authored: Thu Jul 7 11:00:37 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Jul 7 11:00:37 2016 -0500

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 3 +++
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8475f891/CHANGES.txt
--
diff --cc CHANGES.txt
index 1d11149,0e483f1..34e7587
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,7 +1,10 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ 2.2.8
+  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8475f891/src/java/org/apache/cassandra/service/StorageService.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[stefania]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7547e0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7547e0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7547e0d

Branch: refs/heads/cassandra-3.9
Commit: c7547e0de5e2eaa077b05766785de905f4f7902a
Parents: a15c0e4 362e132
Author: Stefania Alborghetti 
Authored: Wed Jun 29 14:05:53 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jun 29 14:05:53 2016 +0800

--
 CHANGES.txt| 2 ++
 src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7547e0d/CHANGES.txt
--
diff --cc CHANGES.txt
index 075d44a,ae37d2c..463cf78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,9 +1,35 @@@
 -3.0.9
 +3.9
+ Merged from 2.2:
+  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 +Merged from 2.1:
 + * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
 + * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
 +
  
 -3.0.8
 - * Fix potential race in schema during new table creation (CASSANDRA-12083)
 +3.8
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * 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:
   * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
   * Disable autocompaction during drain (CASSANDRA-11878)
   * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7547e0d/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
--

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jmckenzie]

Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0294fd89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0294fd89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0294fd89

Branch: refs/heads/cassandra-3.9
Commit: 0294fd8911d80178d6678e9ff057adaed1266fd7
Parents: 53f8f09 2395f9e
Author: Josh McKenzie 
Authored: Tue Jun 28 13:47:49 2016 -0400
Committer: Josh McKenzie 
Committed: Tue Jun 28 13:47:49 2016 -0400

--
 conf/cassandra-env.ps1 | 1 +
 conf/cassandra-env.sh  | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0294fd89/conf/cassandra-env.ps1
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0294fd89/conf/cassandra-env.sh
--