[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/c2299e68
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2299e68
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2299e68

Branch: refs/heads/cassandra-3.11
Commit: c2299e6890b65f6042c74e679dd90713917e9062
Parents: 5af7c5f 95635f3
Author: Yuki Morishita 
Authored: Fri May 12 15:58:58 2017 +0900
Committer: Yuki Morishita 
Committed: Fri May 12 15:58:58 2017 +0900

--
 CHANGES.txt |  1 +
 .../apache/cassandra/tools/LoaderOptions.java   | 26 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f26344,84aba99..9b31d48
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 -3.0.14
 +3.11.0
 + * Fall back to even ranges calculation in clusters with vnodes when tokens 
are distributed unevenly (CASSANDRA-13229)
 + * Fix duration type validation to prevent overflow (CASSANDRA-13218)
 + * Forbid unsupported creation of SASI indexes over partition key columns 
(CASSANDRA-13228)
 + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
 + * UDA fails without input rows (CASSANDRA-13399)
 + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
 + * V5 protocol flags decoding broken (CASSANDRA-13443)
 + * Use write lock not read lock for removing sstables from compaction 
strategies. (CASSANDRA-13422)
 + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors 
(CASSANDRA-13329)
 + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
 + * Add charset to Analyser input stream (CASSANDRA-13151)
 + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277)
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns 
(CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern 
(CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound 
(CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range 
(CASSANDRA-12915).
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * Address message coalescing regression (CASSANDRA-12676)
 + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
 + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 + * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 +Merged from 3.0:
+  * Add storage port options to sstableloader (CASSANDRA-13518)
   * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
   * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
   * Fix NPE in StorageService.excise() (CASSANDRA-13163)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/src/java/org/apache/cassandra/tools/LoaderOptions.java
--
diff --cc src/java/org/apache/cassandra/tools/LoaderOptions.java
index 28d7bce,000..8b3d852
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/tools/LoaderOptions.java
+++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java
@@@ -1,563 -1,0 +1,573 @@@
 +/*
 + *
 + * 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 

[2/5] cassandra git commit: Add storage ports options to sstableloader

[yukim]

Add storage ports options to sstableloader

patch by Zhiyan Shao; reviewed by yukim for CASSANDRA-13518


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

Branch: refs/heads/trunk
Commit: 95635f3123d4ba84465fb57df837074b2121176c
Parents: 33344fa
Author: Zhiyan Shao <zhi...@uber.com>
Authored: Fri May 12 07:39:25 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 12 15:26:41 2017 +0900

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/BulkLoader.java  | 26 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31d5800..84aba99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.14
+ * Add storage port options to sstableloader (CASSANDRA-13518)
  * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
  * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
  * Fix NPE in StorageService.excise() (CASSANDRA-13163)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/src/java/org/apache/cassandra/tools/BulkLoader.java
--
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java 
b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 9dba1b2..c1849f8 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -53,6 +53,8 @@ public class BulkLoader
 private static final String IGNORE_NODES_OPTION  = "ignore";
 private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes";
 private static final String NATIVE_PORT_OPTION = "port";
+private static final String STORAGE_PORT_OPTION = "storage-port";
+private static final String SSL_STORAGE_PORT_OPTION = "ssl-storage-port";
 private static final String USER_OPTION = "username";
 private static final String PASSWD_OPTION = "password";
 private static final String AUTH_PROVIDER_OPTION = "auth-provider";
@@ -313,7 +315,7 @@ public class BulkLoader
 public boolean debug;
 public boolean verbose;
 public boolean noProgress;
-public int nativePort = 9042;
+public int nativePort;
 public String user;
 public String passwd;
 public String authProviderName;
@@ -377,9 +379,6 @@ public class BulkLoader
 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
 opts.noProgress = cmd.hasOption(NOPROGRESS_OPTION);
 
-if (cmd.hasOption(NATIVE_PORT_OPTION))
-opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
-
 if (cmd.hasOption(USER_OPTION))
 opts.user = cmd.getOptionValue(USER_OPTION);
 
@@ -450,8 +449,19 @@ public class BulkLoader
 config.stream_throughput_outbound_megabits_per_sec = 0;
 
config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0;
 }
-opts.storagePort = config.storage_port;
-opts.sslStoragePort = config.ssl_storage_port;
+
+if (cmd.hasOption(NATIVE_PORT_OPTION))
+opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
+else
+opts.nativePort = config.native_transport_port;
+if (cmd.hasOption(STORAGE_PORT_OPTION))
+opts.storagePort = 
Integer.parseInt(cmd.getOptionValue(STORAGE_PORT_OPTION));
+else
+opts.storagePort = config.storage_port;
+if (cmd.hasOption(SSL_STORAGE_PORT_OPTION))
+opts.sslStoragePort = 
Integer.parseInt(cmd.getOptionValue(SSL_STORAGE_PORT_OPTION));
+else
+opts.sslStoragePort = config.ssl_storage_port;
 opts.throttle = 
config.stream_throughput_outbound_megabits_per_sec;
 opts.interDcThrottle = 
config.inter_dc_stream_throughput_outbound_megabits_per_sec;
 opts.clientEncOptions = config.client_encryption_options;
@@ -597,7 +607,9 @@ public class BulkLoader
 options.addOption(null, NOPROGRESS_OPTION,   "don't display 
progress");
 options.addOption("i",  IGNORE_NO

[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/c2299e68
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2299e68
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2299e68

Branch: refs/heads/trunk
Commit: c2299e6890b65f6042c74e679dd90713917e9062
Parents: 5af7c5f 95635f3
Author: Yuki Morishita 
Authored: Fri May 12 15:58:58 2017 +0900
Committer: Yuki Morishita 
Committed: Fri May 12 15:58:58 2017 +0900

--
 CHANGES.txt |  1 +
 .../apache/cassandra/tools/LoaderOptions.java   | 26 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f26344,84aba99..9b31d48
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 -3.0.14
 +3.11.0
 + * Fall back to even ranges calculation in clusters with vnodes when tokens 
are distributed unevenly (CASSANDRA-13229)
 + * Fix duration type validation to prevent overflow (CASSANDRA-13218)
 + * Forbid unsupported creation of SASI indexes over partition key columns 
(CASSANDRA-13228)
 + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
 + * UDA fails without input rows (CASSANDRA-13399)
 + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
 + * V5 protocol flags decoding broken (CASSANDRA-13443)
 + * Use write lock not read lock for removing sstables from compaction 
strategies. (CASSANDRA-13422)
 + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors 
(CASSANDRA-13329)
 + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
 + * Add charset to Analyser input stream (CASSANDRA-13151)
 + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277)
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns 
(CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern 
(CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound 
(CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range 
(CASSANDRA-12915).
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * Address message coalescing regression (CASSANDRA-12676)
 + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
 + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 + * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 +Merged from 3.0:
+  * Add storage port options to sstableloader (CASSANDRA-13518)
   * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
   * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
   * Fix NPE in StorageService.excise() (CASSANDRA-13163)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2299e68/src/java/org/apache/cassandra/tools/LoaderOptions.java
--
diff --cc src/java/org/apache/cassandra/tools/LoaderOptions.java
index 28d7bce,000..8b3d852
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/tools/LoaderOptions.java
+++ b/src/java/org/apache/cassandra/tools/LoaderOptions.java
@@@ -1,563 -1,0 +1,573 @@@
 +/*
 + *
 + * 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 

[1/5] cassandra git commit: Add storage ports options to sstableloader

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 5af7c5ff5 -> c2299e689
  refs/heads/trunk c66044f78 -> dfb90b145


Add storage ports options to sstableloader

patch by Zhiyan Shao; reviewed by yukim for CASSANDRA-13518


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

Branch: refs/heads/cassandra-3.11
Commit: 95635f3123d4ba84465fb57df837074b2121176c
Parents: 33344fa
Author: Zhiyan Shao <zhi...@uber.com>
Authored: Fri May 12 07:39:25 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 12 15:26:41 2017 +0900

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/BulkLoader.java  | 26 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31d5800..84aba99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.14
+ * Add storage port options to sstableloader (CASSANDRA-13518)
  * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
  * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
  * Fix NPE in StorageService.excise() (CASSANDRA-13163)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/src/java/org/apache/cassandra/tools/BulkLoader.java
--
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java 
b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 9dba1b2..c1849f8 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -53,6 +53,8 @@ public class BulkLoader
 private static final String IGNORE_NODES_OPTION  = "ignore";
 private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes";
 private static final String NATIVE_PORT_OPTION = "port";
+private static final String STORAGE_PORT_OPTION = "storage-port";
+private static final String SSL_STORAGE_PORT_OPTION = "ssl-storage-port";
 private static final String USER_OPTION = "username";
 private static final String PASSWD_OPTION = "password";
 private static final String AUTH_PROVIDER_OPTION = "auth-provider";
@@ -313,7 +315,7 @@ public class BulkLoader
 public boolean debug;
 public boolean verbose;
 public boolean noProgress;
-public int nativePort = 9042;
+public int nativePort;
 public String user;
 public String passwd;
 public String authProviderName;
@@ -377,9 +379,6 @@ public class BulkLoader
 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
 opts.noProgress = cmd.hasOption(NOPROGRESS_OPTION);
 
-if (cmd.hasOption(NATIVE_PORT_OPTION))
-opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
-
 if (cmd.hasOption(USER_OPTION))
 opts.user = cmd.getOptionValue(USER_OPTION);
 
@@ -450,8 +449,19 @@ public class BulkLoader
 config.stream_throughput_outbound_megabits_per_sec = 0;
 
config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0;
 }
-opts.storagePort = config.storage_port;
-opts.sslStoragePort = config.ssl_storage_port;
+
+if (cmd.hasOption(NATIVE_PORT_OPTION))
+opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
+else
+opts.nativePort = config.native_transport_port;
+if (cmd.hasOption(STORAGE_PORT_OPTION))
+opts.storagePort = 
Integer.parseInt(cmd.getOptionValue(STORAGE_PORT_OPTION));
+else
+opts.storagePort = config.storage_port;
+if (cmd.hasOption(SSL_STORAGE_PORT_OPTION))
+opts.sslStoragePort = 
Integer.parseInt(cmd.getOptionValue(SSL_STORAGE_PORT_OPTION));
+else
+opts.sslStoragePort = config.ssl_storage_port;
 opts.throttle = 
config.stream_throughput_outbound_megabits_per_sec;
 opts.interDcThrottle = 
config.inter_dc_stream_throughput_outbound_megabits_per_sec;
 opts.clientEncOptions = config.client_encryption_options;
@@ -597,7 +607,9 @@ public class BulkLoader
 options.

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[yukim]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: dfb90b1458ac6ee427f9e329b45c764a3a0a0c06
Parents: c66044f c2299e6
Author: Yuki Morishita 
Authored: Fri May 12 16:00:10 2017 +0900
Committer: Yuki Morishita 
Committed: Fri May 12 16:00:10 2017 +0900

--
 CHANGES.txt |  1 +
 .../apache/cassandra/tools/LoaderOptions.java   | 26 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb90b14/CHANGES.txt
--
diff --cc CHANGES.txt
index 889a3b2,9b31d48..b8b2b90
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,7 -33,9 +98,8 @@@
   * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
   * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
  Merged from 3.0:
+  * Add storage port options to sstableloader (CASSANDRA-13518)
   * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 - * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
   * Fix NPE in StorageService.excise() (CASSANDRA-13163)
   * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
   * Fail repair if insufficient responses received (CASSANDRA-13397)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

cassandra git commit: Add storage ports options to sstableloader

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 33344fae6 -> 95635f312


Add storage ports options to sstableloader

patch by Zhiyan Shao; reviewed by yukim for CASSANDRA-13518


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

Branch: refs/heads/cassandra-3.0
Commit: 95635f3123d4ba84465fb57df837074b2121176c
Parents: 33344fa
Author: Zhiyan Shao <zhi...@uber.com>
Authored: Fri May 12 07:39:25 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 12 15:26:41 2017 +0900

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/BulkLoader.java  | 26 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31d5800..84aba99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.14
+ * Add storage port options to sstableloader (CASSANDRA-13518)
  * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
  * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
  * Fix NPE in StorageService.excise() (CASSANDRA-13163)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95635f31/src/java/org/apache/cassandra/tools/BulkLoader.java
--
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java 
b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 9dba1b2..c1849f8 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -53,6 +53,8 @@ public class BulkLoader
 private static final String IGNORE_NODES_OPTION  = "ignore";
 private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes";
 private static final String NATIVE_PORT_OPTION = "port";
+private static final String STORAGE_PORT_OPTION = "storage-port";
+private static final String SSL_STORAGE_PORT_OPTION = "ssl-storage-port";
 private static final String USER_OPTION = "username";
 private static final String PASSWD_OPTION = "password";
 private static final String AUTH_PROVIDER_OPTION = "auth-provider";
@@ -313,7 +315,7 @@ public class BulkLoader
 public boolean debug;
 public boolean verbose;
 public boolean noProgress;
-public int nativePort = 9042;
+public int nativePort;
 public String user;
 public String passwd;
 public String authProviderName;
@@ -377,9 +379,6 @@ public class BulkLoader
 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
 opts.noProgress = cmd.hasOption(NOPROGRESS_OPTION);
 
-if (cmd.hasOption(NATIVE_PORT_OPTION))
-opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
-
 if (cmd.hasOption(USER_OPTION))
 opts.user = cmd.getOptionValue(USER_OPTION);
 
@@ -450,8 +449,19 @@ public class BulkLoader
 config.stream_throughput_outbound_megabits_per_sec = 0;
 
config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0;
 }
-opts.storagePort = config.storage_port;
-opts.sslStoragePort = config.ssl_storage_port;
+
+if (cmd.hasOption(NATIVE_PORT_OPTION))
+opts.nativePort = 
Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION));
+else
+opts.nativePort = config.native_transport_port;
+if (cmd.hasOption(STORAGE_PORT_OPTION))
+opts.storagePort = 
Integer.parseInt(cmd.getOptionValue(STORAGE_PORT_OPTION));
+else
+opts.storagePort = config.storage_port;
+if (cmd.hasOption(SSL_STORAGE_PORT_OPTION))
+opts.sslStoragePort = 
Integer.parseInt(cmd.getOptionValue(SSL_STORAGE_PORT_OPTION));
+else
+opts.sslStoragePort = config.ssl_storage_port;
 opts.throttle = 
config.stream_throughput_outbound_megabits_per_sec;
 opts.interDcThrottle = 
config.inter_dc_stream_throughput_outbound_megabits_per_sec;
 opts.clientEncOptions = config.client_encryption_options;
@@ -597,7 +607,9 @@ public class BulkLoader
 options.addOption(null, NOPROGRESS_OPTION,   "don't di

cassandra git commit: Remove deprecated repair API

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/trunk add855ae1 -> cc26c8304


Remove deprecated repair API

patch by yukim; reviewed by Paulo Motta for CASSANDRA-11530


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

Branch: refs/heads/trunk
Commit: cc26c8304b4d4312213a0175dcd5f1531e7934ad
Parents: add855a
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Mar 17 15:04:28 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Apr 3 10:44:25 2017 +0900

--
 CHANGES.txt |   1 +
 NEWS.txt|   1 +
 .../apache/cassandra/repair/RepairRunnable.java |  10 -
 .../cassandra/service/ActiveRepairService.java  |  11 --
 .../cassandra/service/StorageService.java   | 192 +--
 .../cassandra/service/StorageServiceMBean.java  |  49 -
 .../progress/jmx/LegacyJMXProgressSupport.java  | 107 ---
 .../jmx/LegacyJMXProgressSupportTest.java   | 118 
 8 files changed, 8 insertions(+), 481 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc26c830/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f64e6a0..adb4caf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
  * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
  * Make it possible to monitor an ideal consistency level separate from actual 
consistency level (CASSANDRA-13289)
  * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc26c830/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 29e7a5b..1ec4637 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -48,6 +48,7 @@ Upgrading
   repaired. For incremental repairs, anticompaction is run at the beginning
   of the repair, instead of at the end.
 - Config option index_interval has been removed (it was deprecated since 
2.0)
+- Deprecated repair JMX APIs are removed.
 
 3.11.0
 ==

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc26c830/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java 
b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 7d9c1d6..986bd7c 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -360,11 +360,6 @@ public class RepairRunnable extends WrappedRunnable 
implements ProgressEventNoti
 
 public void onSuccess(RepairSessionResult result)
 {
-/**
- * If the success message below is modified, it must also be 
updated on
- * {@link 
org.apache.cassandra.utils.progress.jmx.LegacyJMXProgressSupport}
- * for backward-compatibility support.
- */
 String message = String.format("Repair session %s for range %s 
finished", session.getId(),
session.getRanges().toString());
 logger.info(message);
@@ -376,11 +371,6 @@ public class RepairRunnable extends WrappedRunnable 
implements ProgressEventNoti
 
 public void onFailure(Throwable t)
 {
-/**
- * If the failure message below is modified, it must also be 
updated on
- * {@link 
org.apache.cassandra.utils.progress.jmx.LegacyJMXProgressSupport}
- * for backward-compatibility support.
- */
 String message = String.format("Repair session %s for range %s 
failed with error %s",
session.getId(), 
session.getRanges().toString(), t.getMessage());
 logger.error(message, t);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc26c830/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java 
b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 5e33913..381af48 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -89,17 +89,6 @@ import org.apache.cassandra.utils.UUIDGen;
  */
 public class ActiveRepairService implem

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita 
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:01:32 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 58 
 .../LeveledCompactionStrategyTest.java  |  2 +-
 3 files changed, 37 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
--
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -2.2.10
 +3.0.12
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
+  * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --cc 
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
  leveledOptions.put("sstable_size_in_mb", "1");
  SchemaLoader.prepareServer();
  SchemaLoader.createKeyspace(KEYSPACE1,
 -SimpleStrategy.class,
 -KSMetaData.optsWithRF(1),
 +KeyspaceParams.simple(1),
  SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions),
++
.compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions));
 +
.compaction(CompactionParams.lcs(leveledOptions)));
  }
  
  @Test
@@@ -145,15 -149,34 +149,14 @@@
  @Test
  public void testLeveledScanner() throws Exception
  {
- testParallelLeveledCompaction();
  Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
 -final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 -WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
 -final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 -
 -ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
++ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 +store.disableAutoCompaction();
  
 -// Enough data to have a level 1 and 2
 -int rows = 128;
 -int columns = 10;
 +LeveledCompactionStrategy lcs = 
(LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
  
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB 
value
 -// Adds enough data to trigger multiple sstable per level
 -for (int r = 0; r < rows; r++)
 -{
 -DecoratedKey key = Util.dk(String.valueOf(r));
 -Mutation rm = new Mutation(KEYSPACE1, key.getKey());
 -for (int c = 0; c < columns; c++)
 -{
 -rm.add(CF_STANDARDLVL2, 

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

[yukim]

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/b887ae94
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887ae94
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887ae94

Branch: refs/heads/cassandra-3.11
Commit: b887ae944bfbdbd0a808e368acbbc507311fce0e
Parents: f624b14 61f0c98
Author: Yuki Morishita 
Authored: Thu Feb 23 11:12:46 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:12:46 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 50 
 2 files changed, 31 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/CHANGES.txt
--
diff --cc CHANGES.txt
index ca490ba,e978a5c..3e38844
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,135 -23,6 +21,136 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * 

[04/10] cassandra git commit: run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

[yukim]

run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

patch by marcuse; reviewed by yukim for CASSANDRA-12202


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

Branch: refs/heads/trunk
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 84 +---
 .../unit/org/apache/cassandra/SchemaLoader.java |  3 +
 .../LeveledCompactionStrategyTest.java  |  2 +-
 4 files changed, 62 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)
  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
  * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --git 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import 
org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
 {
 public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
 public static final String CF_STANDARDLVL = "StandardLeveled";
+public static final String CF_STANDARDLVL2 = "StandardLeveled2";
 
 @BeforeClass
 public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
 KSMetaData.optsWithRF(1),
 SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 
.compactionStrategyClass(LeveledCompactionStrategy.class)
+
.compactionStrategyOptions(leveledOptions),
+SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
+
.compactionStrategyClass(LeveledCompactionStrategy.class)
 
.compactionStrategyOptions(leveledOptions));
 }
 
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
 @Test
 public void testLeveledScanner() throws Exception
 {
-testParallelLeveledCompaction();
 Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
-store.disableAutoCompaction();
-
+final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
-LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
+final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 
-ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
+
+// Enough data to have a level 1 and 2
+int rows = 128;
+int columns = 10;
 
+// Adds enough data to trigger multiple sstable per level
+for (int r = 0; r < rows; r++)
+{
+  

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[yukim]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: ac2101305722c81542ff8572b0fa082794846a7f
Parents: fbf7e12 b887ae9
Author: Yuki Morishita 
Authored: Thu Feb 23 11:13:13 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:13:13 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 50 
 2 files changed, 31 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac210130/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita 
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:01:32 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 58 
 .../LeveledCompactionStrategyTest.java  |  2 +-
 3 files changed, 37 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
--
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -2.2.10
 +3.0.12
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
+  * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --cc 
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
  leveledOptions.put("sstable_size_in_mb", "1");
  SchemaLoader.prepareServer();
  SchemaLoader.createKeyspace(KEYSPACE1,
 -SimpleStrategy.class,
 -KSMetaData.optsWithRF(1),
 +KeyspaceParams.simple(1),
  SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions),
++
.compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions));
 +
.compaction(CompactionParams.lcs(leveledOptions)));
  }
  
  @Test
@@@ -145,15 -149,34 +149,14 @@@
  @Test
  public void testLeveledScanner() throws Exception
  {
- testParallelLeveledCompaction();
  Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
 -final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 -WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
 -final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 -
 -ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
++ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 +store.disableAutoCompaction();
  
 -// Enough data to have a level 1 and 2
 -int rows = 128;
 -int columns = 10;
 +LeveledCompactionStrategy lcs = 
(LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
  
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB 
value
 -// Adds enough data to trigger multiple sstable per level
 -for (int r = 0; r < rows; r++)
 -{
 -DecoratedKey key = Util.dk(String.valueOf(r));
 -Mutation rm = new Mutation(KEYSPACE1, key.getKey());
 -for (int c = 0; c < columns; c++)
 -{
 -rm.add(CF_STANDARDLVL2, 

[03/10] cassandra git commit: run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

[yukim]

run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

patch by marcuse; reviewed by yukim for CASSANDRA-12202


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

Branch: refs/heads/cassandra-3.11
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 84 +---
 .../unit/org/apache/cassandra/SchemaLoader.java |  3 +
 .../LeveledCompactionStrategyTest.java  |  2 +-
 4 files changed, 62 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)
  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
  * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --git 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import 
org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
 {
 public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
 public static final String CF_STANDARDLVL = "StandardLeveled";
+public static final String CF_STANDARDLVL2 = "StandardLeveled2";
 
 @BeforeClass
 public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
 KSMetaData.optsWithRF(1),
 SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 
.compactionStrategyClass(LeveledCompactionStrategy.class)
+
.compactionStrategyOptions(leveledOptions),
+SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
+
.compactionStrategyClass(LeveledCompactionStrategy.class)
 
.compactionStrategyOptions(leveledOptions));
 }
 
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
 @Test
 public void testLeveledScanner() throws Exception
 {
-testParallelLeveledCompaction();
 Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
-store.disableAutoCompaction();
-
+final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
-LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
+final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 
-ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
+
+// Enough data to have a level 1 and 2
+int rows = 128;
+int columns = 10;
 
+// Adds enough data to trigger multiple sstable per level
+for (int r = 0; r < rows; r++)
+{
+  

[01/10] cassandra git commit: run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 88f36a095 -> 6ffd5cc5d
  refs/heads/cassandra-3.0 51796ea63 -> 61f0c988f
  refs/heads/cassandra-3.11 f624b14ae -> b887ae944
  refs/heads/trunk fbf7e1274 -> ac2101305


run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

patch by marcuse; reviewed by yukim for CASSANDRA-12202


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

Branch: refs/heads/cassandra-2.2
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 84 +---
 .../unit/org/apache/cassandra/SchemaLoader.java |  3 +
 .../LeveledCompactionStrategyTest.java  |  2 +-
 4 files changed, 62 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)
  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
  * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --git 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import 
org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
 {
 public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
 public static final String CF_STANDARDLVL = "StandardLeveled";
+public static final String CF_STANDARDLVL2 = "StandardLeveled2";
 
 @BeforeClass
 public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
 KSMetaData.optsWithRF(1),
 SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 
.compactionStrategyClass(LeveledCompactionStrategy.class)
+
.compactionStrategyOptions(leveledOptions),
+SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
+
.compactionStrategyClass(LeveledCompactionStrategy.class)
 
.compactionStrategyOptions(leveledOptions));
 }
 
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
 @Test
 public void testLeveledScanner() throws Exception
 {
-testParallelLeveledCompaction();
 Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
-store.disableAutoCompaction();
-
+final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
-LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
+final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 
-ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have mult

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita 
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:01:32 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 58 
 .../LeveledCompactionStrategyTest.java  |  2 +-
 3 files changed, 37 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
--
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -2.2.10
 +3.0.12
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
+  * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --cc 
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
  leveledOptions.put("sstable_size_in_mb", "1");
  SchemaLoader.prepareServer();
  SchemaLoader.createKeyspace(KEYSPACE1,
 -SimpleStrategy.class,
 -KSMetaData.optsWithRF(1),
 +KeyspaceParams.simple(1),
  SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions),
++
.compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
 -
.compactionStrategyClass(LeveledCompactionStrategy.class)
 -
.compactionStrategyOptions(leveledOptions));
 +
.compaction(CompactionParams.lcs(leveledOptions)));
  }
  
  @Test
@@@ -145,15 -149,34 +149,14 @@@
  @Test
  public void testLeveledScanner() throws Exception
  {
- testParallelLeveledCompaction();
  Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
 -final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 -WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
 -final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 -
 -ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
++ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 +store.disableAutoCompaction();
  
 -// Enough data to have a level 1 and 2
 -int rows = 128;
 -int columns = 10;
 +LeveledCompactionStrategy lcs = 
(LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
  
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB 
value
 -// Adds enough data to trigger multiple sstable per level
 -for (int r = 0; r < rows; r++)
 -{
 -DecoratedKey key = Util.dk(String.valueOf(r));
 -Mutation rm = new Mutation(KEYSPACE1, key.getKey());
 -for (int c = 0; c < columns; c++)
 -{
 -rm.add(CF_STANDARDLVL2, 

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/b887ae94
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887ae94
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887ae94

Branch: refs/heads/trunk
Commit: b887ae944bfbdbd0a808e368acbbc507311fce0e
Parents: f624b14 61f0c98
Author: Yuki Morishita 
Authored: Thu Feb 23 11:12:46 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:12:46 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 50 
 2 files changed, 31 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/CHANGES.txt
--
diff --cc CHANGES.txt
index ca490ba,e978a5c..3e38844
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,135 -23,6 +21,136 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
 +Merged from 2.2:
++ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 + * Fix negative mean latency metric (CASSANDRA-12876)
 + * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
 +Merged from 2.1:
 + * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 + * Use portable stderr for java error in startup (CASSANDRA-13211)
 + * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 +
 +3.10
 + * Fix secondary index queries regression (CASSANDRA-13013)
 + * Add duration type to the protocol V5 (CASSANDRA-12850)
 + * Fix duration type validation (CASSANDRA-13143)
 + * Fix flaky GcCompactionTest (CASSANDRA-12664)
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does 

[02/10] cassandra git commit: run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

[yukim]

run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table

patch by marcuse; reviewed by yukim for CASSANDRA-12202


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

Branch: refs/heads/cassandra-3.0
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 84 +---
 .../unit/org/apache/cassandra/SchemaLoader.java |  3 +
 .../LeveledCompactionStrategyTest.java  |  2 +-
 4 files changed, 62 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)
  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
  * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --git 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import 
org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
 {
 public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
 public static final String CF_STANDARDLVL = "StandardLeveled";
+public static final String CF_STANDARDLVL2 = "StandardLeveled2";
 
 @BeforeClass
 public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
 KSMetaData.optsWithRF(1),
 SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 
.compactionStrategyClass(LeveledCompactionStrategy.class)
+
.compactionStrategyOptions(leveledOptions),
+SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL2)
+
.compactionStrategyClass(LeveledCompactionStrategy.class)
 
.compactionStrategyOptions(leveledOptions));
 }
 
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
 @Test
 public void testLeveledScanner() throws Exception
 {
-testParallelLeveledCompaction();
 Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
-store.disableAutoCompaction();
-
+final ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
 WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) 
store.getCompactionStrategy());
-LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
+final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
strategy.getWrappedStrategies().get(1);
 
-ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
+
+// Enough data to have a level 1 and 2
+int rows = 128;
+int columns = 10;
 
+// Adds enough data to trigger multiple sstable per level
+for (int r = 0; r < rows; r++)
+{
+  

[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[yukim]

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: fbf7e127424a006b6f7f9c1a669db72727efef87
Parents: cc51b4d f624b14
Author: Yuki Morishita 
Authored: Thu Feb 23 10:09:05 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 10:09:05 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbf7e127/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--

[2/6] cassandra git commit: Remove unnecessary assertion from AntiCompactionTest

[yukim]

Remove unnecessary assertion from AntiCompactionTest

patch by Jay Zhuang; reviewed by yukim for CASSANDRA-13070


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

Branch: refs/heads/cassandra-3.11
Commit: 51796ea63420f8daa49c9d491588ba9740c6b0d1
Parents: 5fba118
Author: Jay Zhuang <jay.zhu...@yahoo.com>
Authored: Thu Feb 23 10:06:57 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:37 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b744b40..afda236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
  * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 Merged from 2.2
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java 
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 4c25f3a..b98421d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -143,7 +143,6 @@ public class AntiCompactionTest
 cfs.disableAutoCompaction();
 SSTableReader s = writeFile(cfs, 1000);
 cfs.addSSTable(s);
-long origSize = s.bytesOnDisk();
 Range range = new Range(new 
BytesToken(ByteBufferUtil.bytes(0)), new BytesToken(ByteBufferUtil.bytes(500)));
 Collection sstables = cfs.getLiveSSTables();
 UUID parentRepairSession = UUID.randomUUID();
@@ -161,7 +160,6 @@ public class AntiCompactionTest
 }
 assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount());
 assertEquals(rows, 1000 * (1000 * 5));//See writeFile for how this 
number is derived
-assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.getCount(), 
1600);
 }
 
 private SSTableReader writeFile(ColumnFamilyStore cfs, int count)

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/f624b14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f624b14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f624b14a

Branch: refs/heads/trunk
Commit: f624b14ae586b3dfd4c4d24e04990ea083bc2c17
Parents: b3490c0 51796ea
Author: Yuki Morishita 
Authored: Thu Feb 23 10:08:56 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 10:08:56 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f624b14a/CHANGES.txt
--
diff --cc CHANGES.txt
index 3dc192f,afda236..ca490ba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
 -3.0.12
 +3.11.0
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 +Merged from 3.0:
+  * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
   * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 -Merged from 2.2
 - * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 - * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 - * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 -Merged from 2.1:
 - * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 -
 -3.0.11
   * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
   * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 - * Hint related logging should include the IP address of the destination in 
addition to 
 + * Hint related logging should include the IP address of the destination in 
addition to
 host ID (CASSANDRA-13205)
   * Reloading logback.xml does not work (CASSANDRA-13173)
   * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/f624b14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f624b14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f624b14a

Branch: refs/heads/cassandra-3.11
Commit: f624b14ae586b3dfd4c4d24e04990ea083bc2c17
Parents: b3490c0 51796ea
Author: Yuki Morishita 
Authored: Thu Feb 23 10:08:56 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 10:08:56 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f624b14a/CHANGES.txt
--
diff --cc CHANGES.txt
index 3dc192f,afda236..ca490ba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
 -3.0.12
 +3.11.0
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 +Merged from 3.0:
+  * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
   * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 -Merged from 2.2
 - * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 - * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 - * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
 -Merged from 2.1:
 - * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 -
 -3.0.11
   * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
   * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 - * Hint related logging should include the IP address of the destination in 
addition to 
 + * Hint related logging should include the IP address of the destination in 
addition to
 host ID (CASSANDRA-13205)
   * Reloading logback.xml does not work (CASSANDRA-13173)
   * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)

[1/6] cassandra git commit: Remove unnecessary assertion from AntiCompactionTest

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 5fba118e9 -> 51796ea63
  refs/heads/cassandra-3.11 b3490c062 -> f624b14ae
  refs/heads/trunk cc51b4db0 -> fbf7e1274


Remove unnecessary assertion from AntiCompactionTest

patch by Jay Zhuang; reviewed by yukim for CASSANDRA-13070


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

Branch: refs/heads/cassandra-3.0
Commit: 51796ea63420f8daa49c9d491588ba9740c6b0d1
Parents: 5fba118
Author: Jay Zhuang <jay.zhu...@yahoo.com>
Authored: Thu Feb 23 10:06:57 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:37 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b744b40..afda236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
  * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 Merged from 2.2
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java 
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 4c25f3a..b98421d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -143,7 +143,6 @@ public class AntiCompactionTest
 cfs.disableAutoCompaction();
 SSTableReader s = writeFile(cfs, 1000);
 cfs.addSSTable(s);
-long origSize = s.bytesOnDisk();
 Range range = new Range(new 
BytesToken(ByteBufferUtil.bytes(0)), new BytesToken(ByteBufferUtil.bytes(500)));
 Collection sstables = cfs.getLiveSSTables();
 UUID parentRepairSession = UUID.randomUUID();
@@ -161,7 +160,6 @@ public class AntiCompactionTest
 }
 assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount());
 assertEquals(rows, 1000 * (1000 * 5));//See writeFile for how this 
number is derived
-assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.getCount(), 
1600);
 }
 
 private SSTableReader writeFile(ColumnFamilyStore cfs, int count)

[3/6] cassandra git commit: Remove unnecessary assertion from AntiCompactionTest

[yukim]

Remove unnecessary assertion from AntiCompactionTest

patch by Jay Zhuang; reviewed by yukim for CASSANDRA-13070


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

Branch: refs/heads/trunk
Commit: 51796ea63420f8daa49c9d491588ba9740c6b0d1
Parents: 5fba118
Author: Jay Zhuang <jay.zhu...@yahoo.com>
Authored: Thu Feb 23 10:06:57 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:37 2017 +0900

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b744b40..afda236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
  * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 Merged from 2.2
  * Fix failing COPY TO STDOUT (CASSANDRA-12497)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java 
b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 4c25f3a..b98421d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -143,7 +143,6 @@ public class AntiCompactionTest
 cfs.disableAutoCompaction();
 SSTableReader s = writeFile(cfs, 1000);
 cfs.addSSTable(s);
-long origSize = s.bytesOnDisk();
 Range range = new Range(new 
BytesToken(ByteBufferUtil.bytes(0)), new BytesToken(ByteBufferUtil.bytes(500)));
 Collection sstables = cfs.getLiveSSTables();
 UUID parentRepairSession = UUID.randomUUID();
@@ -161,7 +160,6 @@ public class AntiCompactionTest
 }
 assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount());
 assertEquals(rows, 1000 * (1000 * 5));//See writeFile for how this 
number is derived
-assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.getCount(), 
1600);
 }
 
 private SSTableReader writeFile(ColumnFamilyStore cfs, int count)

[01/10] cassandra git commit: Fix assertion for certain legacy range tombstone pattern

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 806ac77ee -> 52bf7acb0
  refs/heads/cassandra-3.11 0b489776c -> e63c7a0ac
  refs/heads/cassandra-3.X 92cb311f9 -> e7c19c609
  refs/heads/trunk 7843d8cc2 -> 39d7cf50e


Fix assertion for certain legacy range tombstone pattern

patch by yukim; reviewed by pcmanus for CASSANDRA-12203


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

Branch: refs/heads/cassandra-3.0
Commit: 52bf7acb0520411f420ccf36b9a3770674f604f6
Parents: 806ac77
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Jan 16 10:23:46 2017 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Jan 16 10:26:23 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 034ac31..e4afc3c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
  * Set javac encoding to utf-8 (CASSANDRA-11077)
  * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
  * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--
diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java 
b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
index bf9c2b8..a2d51e13 100644
--- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
+++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
@@ -647,7 +647,7 @@ public abstract class UnfilteredDeserializer
 // If the new tombstone don't supersedes the currently 
open tombstone, we don't have anything to return, we
 // just add the new tombstone (because we know tombstone 
is not fully shadowed, this imply the new tombstone
 // simply extend after the first one and we'll deal with 
it later)
-assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) > 0;
+assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) <= 0;
 openTombstones.add(tombstone);
 return null;
 }

[10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/39d7cf50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39d7cf50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39d7cf50

Branch: refs/heads/trunk
Commit: 39d7cf50ec09e0f3ac27229853ad4fe979e3507f
Parents: 7843d8c e7c19c6
Author: Yuki Morishita 
Authored: Mon Jan 16 10:36:30 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:36:30 2017 -0600

--

--

[04/10] cassandra git commit: Fix assertion for certain legacy range tombstone pattern

[yukim]

Fix assertion for certain legacy range tombstone pattern

patch by yukim; reviewed by pcmanus for CASSANDRA-12203


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

Branch: refs/heads/trunk
Commit: 52bf7acb0520411f420ccf36b9a3770674f604f6
Parents: 806ac77
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Jan 16 10:23:46 2017 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Jan 16 10:26:23 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 034ac31..e4afc3c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
  * Set javac encoding to utf-8 (CASSANDRA-11077)
  * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
  * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--
diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java 
b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
index bf9c2b8..a2d51e13 100644
--- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
+++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
@@ -647,7 +647,7 @@ public abstract class UnfilteredDeserializer
 // If the new tombstone don't supersedes the currently 
open tombstone, we don't have anything to return, we
 // just add the new tombstone (because we know tombstone 
is not fully shadowed, this imply the new tombstone
 // simply extend after the first one and we'll deal with 
it later)
-assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) > 0;
+assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) <= 0;
 openTombstones.add(tombstone);
 return null;
 }

[09/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: e7c19c609a8d708cd3b36d80ff44376f3a7554a8
Parents: 92cb311 e63c7a0
Author: Yuki Morishita 
Authored: Mon Jan 16 10:35:35 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:35:35 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c19c60/CHANGES.txt
--
diff --cc CHANGES.txt
index f1343b8,9c0b51b..3a0c78d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -132,8 -111,8 +132,9 @@@
   * Restore resumable hints delivery (CASSANDRA-11960)
   * Properly report LWT contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
   * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
   * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
   * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)

[07/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/e63c7a0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e63c7a0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e63c7a0a

Branch: refs/heads/trunk
Commit: e63c7a0ac3b365d7cad859adca0025cccfe2ca6a
Parents: 0b48977 52bf7ac
Author: Yuki Morishita 
Authored: Mon Jan 16 10:28:40 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:28:40 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63c7a0a/CHANGES.txt
--
diff --cc CHANGES.txt
index c7e4114,e4afc3c..9c0b51b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,117 -1,8 +1,118 @@@
 -3.0.11
 +3.10
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries 

[03/10] cassandra git commit: Fix assertion for certain legacy range tombstone pattern

[yukim]

Fix assertion for certain legacy range tombstone pattern

patch by yukim; reviewed by pcmanus for CASSANDRA-12203


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

Branch: refs/heads/cassandra-3.X
Commit: 52bf7acb0520411f420ccf36b9a3770674f604f6
Parents: 806ac77
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Jan 16 10:23:46 2017 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Jan 16 10:26:23 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 034ac31..e4afc3c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
  * Set javac encoding to utf-8 (CASSANDRA-11077)
  * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
  * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--
diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java 
b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
index bf9c2b8..a2d51e13 100644
--- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
+++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
@@ -647,7 +647,7 @@ public abstract class UnfilteredDeserializer
 // If the new tombstone don't supersedes the currently 
open tombstone, we don't have anything to return, we
 // just add the new tombstone (because we know tombstone 
is not fully shadowed, this imply the new tombstone
 // simply extend after the first one and we'll deal with 
it later)
-assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) > 0;
+assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) <= 0;
 openTombstones.add(tombstone);
 return null;
 }

[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: e7c19c609a8d708cd3b36d80ff44376f3a7554a8
Parents: 92cb311 e63c7a0
Author: Yuki Morishita 
Authored: Mon Jan 16 10:35:35 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:35:35 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c19c60/CHANGES.txt
--
diff --cc CHANGES.txt
index f1343b8,9c0b51b..3a0c78d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -132,8 -111,8 +132,9 @@@
   * Restore resumable hints delivery (CASSANDRA-11960)
   * Properly report LWT contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
   * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
   * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
   * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)

[06/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/e63c7a0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e63c7a0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e63c7a0a

Branch: refs/heads/cassandra-3.11
Commit: e63c7a0ac3b365d7cad859adca0025cccfe2ca6a
Parents: 0b48977 52bf7ac
Author: Yuki Morishita 
Authored: Mon Jan 16 10:28:40 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:28:40 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63c7a0a/CHANGES.txt
--
diff --cc CHANGES.txt
index c7e4114,e4afc3c..9c0b51b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,117 -1,8 +1,118 @@@
 -3.0.11
 +3.10
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for 

[02/10] cassandra git commit: Fix assertion for certain legacy range tombstone pattern

[yukim]

Fix assertion for certain legacy range tombstone pattern

patch by yukim; reviewed by pcmanus for CASSANDRA-12203


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

Branch: refs/heads/cassandra-3.11
Commit: 52bf7acb0520411f420ccf36b9a3770674f604f6
Parents: 806ac77
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Jan 16 10:23:46 2017 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Jan 16 10:26:23 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 034ac31..e4afc3c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
  * Set javac encoding to utf-8 (CASSANDRA-11077)
  * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
  * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bf7acb/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
--
diff --git a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java 
b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
index bf9c2b8..a2d51e13 100644
--- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
+++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
@@ -647,7 +647,7 @@ public abstract class UnfilteredDeserializer
 // If the new tombstone don't supersedes the currently 
open tombstone, we don't have anything to return, we
 // just add the new tombstone (because we know tombstone 
is not fully shadowed, this imply the new tombstone
 // simply extend after the first one and we'll deal with 
it later)
-assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) > 0;
+assert metadata.comparator.compare(tombstone.start.bound, 
first.stop.bound) <= 0;
 openTombstones.add(tombstone);
 return null;
 }

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/e63c7a0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e63c7a0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e63c7a0a

Branch: refs/heads/cassandra-3.X
Commit: e63c7a0ac3b365d7cad859adca0025cccfe2ca6a
Parents: 0b48977 52bf7ac
Author: Yuki Morishita 
Authored: Mon Jan 16 10:28:40 2017 -0600
Committer: Yuki Morishita 
Committed: Mon Jan 16 10:28:40 2017 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63c7a0a/CHANGES.txt
--
diff --cc CHANGES.txt
index c7e4114,e4afc3c..9c0b51b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,117 -1,8 +1,118 @@@
 -3.0.11
 +3.10
 + * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
 + * Fixed query monitoring for range queries (CASSANDRA-13050)
 + * Remove outboundBindAny configuration property (CASSANDRA-12673)
 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for 

[08/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 003b624,000..a6ed3ba
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@@ -1,1112 -1,0 +1,1114 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.index;
 +
 +import java.lang.reflect.Constructor;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.function.Function;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import com.google.common.base.Joiner;
 +import com.google.common.base.Strings;
 +import com.google.common.collect.ImmutableSet;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Maps;
 +import com.google.common.collect.Sets;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.Futures;
 +import com.google.common.util.concurrent.MoreExecutors;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.ColumnDefinition;
++import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.compaction.CompactionManager;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.lifecycle.View;
 +import org.apache.cassandra.db.partitions.PartitionIterators;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.internal.CassandraIndex;
 +import org.apache.cassandra.index.transactions.*;
 +import org.apache.cassandra.io.sstable.ReducingKeyIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.Indexes;
 +import org.apache.cassandra.service.pager.SinglePartitionPager;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.transport.Server;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.concurrent.Refs;
 +
 +/**
 + * Handles the core maintenance functionality associated with indexes: 
adding/removing them to or from
 + * a table, (re)building during bootstrap or other streaming operations, 
flushing, reloading metadata
 + * and so on.
 + *
 + * The Index interface defines a number of methods which return Callable. 
These are primarily the
 + * management tasks for an index implementation. Most of them are currently 
executed in a blocking
 + * fashion via submission to SIM's blockingExecutor. This provides the 
desired behaviour in pretty
 + * much all cases, as tasks like flushing an index needs to be executed 
synchronously to avoid potentially
 + * deadlocking on the FlushWriter or PostFlusher. Several of these 
Callable returning methods on Index could
 + * then be defined with as void and called directly from SIM (rather than 
being run via the executor service).
 + * Separating the task defintion from execution gives us greater flexibility 
though, so that in future, for example,
 + * if the flush process allows it we leave open the possibility of executing 
more of these tasks asynchronously.
 + *
 + * The primary exception to the above is the Callable returned from 
Index#addIndexedColumn. This may
 + * involve a significant effort, building a new index over any existing data. 
We perform this task asynchronously;
 + * as it is called as part of a schema 

[17/19] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: c9ead4826a1dfb246b4ef6c916106bb13fcdbdc5
Parents: ddefb1d 66e2145
Author: Yuki Morishita 
Authored: Tue Dec 13 15:59:23 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:59:23 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


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

[03/19] cassandra git commit: Temporarily fix bug that creates commit log when running offline tools

[yukim]

Temporarily fix bug that creates commit log when running offline tools

patch by yukim; reviewed by thobbs for CASSANDRA-8616


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

Branch: refs/heads/trunk
Commit: 66f1aaf88d3cde5c52b13d71d3326da5eda16fb1
Parents: fb29400
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 11 19:06:27 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 13 15:51:37 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/compaction/CompactionTask.java | 22 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 36 
 .../io/sstable/format/SSTableReader.java|  8 +++--
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../io/sstable/CQLSSTableWriterLongTest.java|  2 ++
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../config/DatabaseDescriptorTest.java  |  6 
 .../apache/cassandra/db/CounterCellTest.java|  3 ++
 .../org/apache/cassandra/db/NativeCellTest.java |  3 ++
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../service/StorageServiceServerTest.java   |  1 +
 25 files changed, 118 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f02350d..8cff097 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
  * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a3fb79b..35debd0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -102,6 +102,18 @@ public class DatabaseDescriptor
 private static Comparator localComparator;
 private static boolean hasLoggedConfig;
 
+private static boolean daemonInitialized;
+
+public static boolean isDaemonInitialized()
+{
+return daemonInitialized;
+}
+
+public static void setDaemonInitialized()
+{
+daemonInitialized = true;
+}
+
 public static void forceStaticInitialization() {}
 static
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c6b69dc..4bc46d0 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -388,9 +388,13 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 logger.info("Initializing {}.{}", keyspace.getName(), name);
 
-// scan for sstables corresponding to this cf and load them
-data = new Tracker(this, loadSSTables);
+// Create Memtable only on online
+Memtable initialMemtable = null;
+if (DatabaseDescriptor.isDaemonInitialized())
+initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);

[05/19] cassandra git commit: Temporarily fix bug that creates commit log when running offline tools

[yukim]

Temporarily fix bug that creates commit log when running offline tools

patch by yukim; reviewed by thobbs for CASSANDRA-8616


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

Branch: refs/heads/cassandra-3.X
Commit: 66f1aaf88d3cde5c52b13d71d3326da5eda16fb1
Parents: fb29400
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 11 19:06:27 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 13 15:51:37 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/compaction/CompactionTask.java | 22 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 36 
 .../io/sstable/format/SSTableReader.java|  8 +++--
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../io/sstable/CQLSSTableWriterLongTest.java|  2 ++
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../config/DatabaseDescriptorTest.java  |  6 
 .../apache/cassandra/db/CounterCellTest.java|  3 ++
 .../org/apache/cassandra/db/NativeCellTest.java |  3 ++
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../service/StorageServiceServerTest.java   |  1 +
 25 files changed, 118 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f02350d..8cff097 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
  * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a3fb79b..35debd0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -102,6 +102,18 @@ public class DatabaseDescriptor
 private static Comparator localComparator;
 private static boolean hasLoggedConfig;
 
+private static boolean daemonInitialized;
+
+public static boolean isDaemonInitialized()
+{
+return daemonInitialized;
+}
+
+public static void setDaemonInitialized()
+{
+daemonInitialized = true;
+}
+
 public static void forceStaticInitialization() {}
 static
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c6b69dc..4bc46d0 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -388,9 +388,13 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 logger.info("Initializing {}.{}", keyspace.getName(), name);
 
-// scan for sstables corresponding to this cf and load them
-data = new Tracker(this, loadSSTables);
+// Create Memtable only on online
+Memtable initialMemtable = null;
+if (DatabaseDescriptor.isDaemonInitialized())
+initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);

[02/19] cassandra git commit: Temporarily fix bug that creates commit log when running offline tools

[yukim]

Temporarily fix bug that creates commit log when running offline tools

patch by yukim; reviewed by thobbs for CASSANDRA-8616


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

Branch: refs/heads/cassandra-3.0
Commit: 66f1aaf88d3cde5c52b13d71d3326da5eda16fb1
Parents: fb29400
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 11 19:06:27 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 13 15:51:37 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/compaction/CompactionTask.java | 22 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 36 
 .../io/sstable/format/SSTableReader.java|  8 +++--
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../io/sstable/CQLSSTableWriterLongTest.java|  2 ++
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../config/DatabaseDescriptorTest.java  |  6 
 .../apache/cassandra/db/CounterCellTest.java|  3 ++
 .../org/apache/cassandra/db/NativeCellTest.java |  3 ++
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../service/StorageServiceServerTest.java   |  1 +
 25 files changed, 118 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f02350d..8cff097 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
  * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a3fb79b..35debd0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -102,6 +102,18 @@ public class DatabaseDescriptor
 private static Comparator localComparator;
 private static boolean hasLoggedConfig;
 
+private static boolean daemonInitialized;
+
+public static boolean isDaemonInitialized()
+{
+return daemonInitialized;
+}
+
+public static void setDaemonInitialized()
+{
+daemonInitialized = true;
+}
+
 public static void forceStaticInitialization() {}
 static
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c6b69dc..4bc46d0 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -388,9 +388,13 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 logger.info("Initializing {}.{}", keyspace.getName(), name);
 
-// scan for sstables corresponding to this cf and load them
-data = new Tracker(this, loadSSTables);
+// Create Memtable only on online
+Memtable initialMemtable = null;
+if (DatabaseDescriptor.isDaemonInitialized())
+initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);

[06/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 003b624,000..a6ed3ba
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@@ -1,1112 -1,0 +1,1114 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.index;
 +
 +import java.lang.reflect.Constructor;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.function.Function;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import com.google.common.base.Joiner;
 +import com.google.common.base.Strings;
 +import com.google.common.collect.ImmutableSet;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Maps;
 +import com.google.common.collect.Sets;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.Futures;
 +import com.google.common.util.concurrent.MoreExecutors;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.ColumnDefinition;
++import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.compaction.CompactionManager;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.lifecycle.View;
 +import org.apache.cassandra.db.partitions.PartitionIterators;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.internal.CassandraIndex;
 +import org.apache.cassandra.index.transactions.*;
 +import org.apache.cassandra.io.sstable.ReducingKeyIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.Indexes;
 +import org.apache.cassandra.service.pager.SinglePartitionPager;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.transport.Server;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.concurrent.Refs;
 +
 +/**
 + * Handles the core maintenance functionality associated with indexes: 
adding/removing them to or from
 + * a table, (re)building during bootstrap or other streaming operations, 
flushing, reloading metadata
 + * and so on.
 + *
 + * The Index interface defines a number of methods which return Callable. 
These are primarily the
 + * management tasks for an index implementation. Most of them are currently 
executed in a blocking
 + * fashion via submission to SIM's blockingExecutor. This provides the 
desired behaviour in pretty
 + * much all cases, as tasks like flushing an index needs to be executed 
synchronously to avoid potentially
 + * deadlocking on the FlushWriter or PostFlusher. Several of these 
Callable returning methods on Index could
 + * then be defined with as void and called directly from SIM (rather than 
being run via the executor service).
 + * Separating the task defintion from execution gives us greater flexibility 
though, so that in future, for example,
 + * if the flush process allows it we leave open the possibility of executing 
more of these tasks asynchronously.
 + *
 + * The primary exception to the above is the Callable returned from 
Index#addIndexedColumn. This may
 + * involve a significant effort, building a new index over any existing data. 
We perform this task asynchronously;
 + * as it is called as part of a schema 

[13/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 0fe82be83cceceb12172d63913388678253413bc
Parents: e9b7a0f 66f1aaf
Author: Yuki Morishita 
Authored: Tue Dec 13 15:55:34 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:55:34 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/PartitionRangeReadCommand.java |  3 +-
 .../cassandra/db/compaction/CompactionTask.java | 18 +++
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 ++-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../config/DatabaseDescriptorTest.java  |  6 
 .../org/apache/cassandra/cql3/CQLTester.java|  1 +
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../metrics/HintedHandOffMetricsTest.java   |  7 
 .../service/StorageServiceServerTest.java   |  1 +
 .../concurrent/AbstractTransactionalTest.java   |  7 
 27 files changed, 124 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/CHANGES.txt
--
diff --cc CHANGES.txt
index 5621c93,8cff097..145afb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.9
 +3.0.11
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
   * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
   * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
   * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 71e1653,4bc46d0..39ed804
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -388,13 -388,17 +388,17 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+   

[12/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 003b624,000..a6ed3ba
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@@ -1,1112 -1,0 +1,1114 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.index;
 +
 +import java.lang.reflect.Constructor;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.function.Function;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import com.google.common.base.Joiner;
 +import com.google.common.base.Strings;
 +import com.google.common.collect.ImmutableSet;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Maps;
 +import com.google.common.collect.Sets;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.Futures;
 +import com.google.common.util.concurrent.MoreExecutors;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.ColumnDefinition;
++import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.compaction.CompactionManager;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.lifecycle.View;
 +import org.apache.cassandra.db.partitions.PartitionIterators;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.internal.CassandraIndex;
 +import org.apache.cassandra.index.transactions.*;
 +import org.apache.cassandra.io.sstable.ReducingKeyIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.Indexes;
 +import org.apache.cassandra.service.pager.SinglePartitionPager;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.transport.Server;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.concurrent.Refs;
 +
 +/**
 + * Handles the core maintenance functionality associated with indexes: 
adding/removing them to or from
 + * a table, (re)building during bootstrap or other streaming operations, 
flushing, reloading metadata
 + * and so on.
 + *
 + * The Index interface defines a number of methods which return Callable. 
These are primarily the
 + * management tasks for an index implementation. Most of them are currently 
executed in a blocking
 + * fashion via submission to SIM's blockingExecutor. This provides the 
desired behaviour in pretty
 + * much all cases, as tasks like flushing an index needs to be executed 
synchronously to avoid potentially
 + * deadlocking on the FlushWriter or PostFlusher. Several of these 
Callable returning methods on Index could
 + * then be defined with as void and called directly from SIM (rather than 
being run via the executor service).
 + * Separating the task defintion from execution gives us greater flexibility 
though, so that in future, for example,
 + * if the flush process allows it we leave open the possibility of executing 
more of these tasks asynchronously.
 + *
 + * The primary exception to the above is the Callable returned from 
Index#addIndexedColumn. This may
 + * involve a significant effort, building a new index over any existing data. 
We perform this task asynchronously;
 + * as it is called as part of a schema 

[19/19] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/402f8e00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/402f8e00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/402f8e00

Branch: refs/heads/trunk
Commit: 402f8e00606a54dcac46c60463358501a6a2e686
Parents: cd5aacc c9ead48
Author: Yuki Morishita 
Authored: Tue Dec 13 16:27:05 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 16:27:05 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/402f8e00/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/402f8e00/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 9477aeb,045fc26..df4d63c
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@@ -219,7 -221,9 +219,9 @@@ public class PartitionRangeReadCommand 
  if (!sstable.isRepaired())
  oldestUnrepairedTombstone = 
Math.min(oldestUnrepairedTombstone, sstable.getMinLocalDeletionTime());
  }
- return 
checkCacheFilter(UnfilteredPartitionIterators.mergeLazily(iterators, 
nowInSec()), cfs);
+ // iterators can be empty for offline tools
 -return iterators.isEmpty() ? 
EmptyIterators.unfilteredPartition(metadata(), isForThrift())
++return iterators.isEmpty() ? 
EmptyIterators.unfilteredPartition(metadata())
+: 
checkCacheFilter(UnfilteredPartitionIterators.mergeLazily(iterators, 
nowInSec()), cfs);
  }
  catch (RuntimeException | Error e)
  {

[11/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 0fe82be83cceceb12172d63913388678253413bc
Parents: e9b7a0f 66f1aaf
Author: Yuki Morishita 
Authored: Tue Dec 13 15:55:34 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:55:34 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/PartitionRangeReadCommand.java |  3 +-
 .../cassandra/db/compaction/CompactionTask.java | 18 +++
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 ++-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../config/DatabaseDescriptorTest.java  |  6 
 .../org/apache/cassandra/cql3/CQLTester.java|  1 +
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../metrics/HintedHandOffMetricsTest.java   |  7 
 .../service/StorageServiceServerTest.java   |  1 +
 .../concurrent/AbstractTransactionalTest.java   |  7 
 27 files changed, 124 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/CHANGES.txt
--
diff --cc CHANGES.txt
index 5621c93,8cff097..145afb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.9
 +3.0.11
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
   * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
   * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
   * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 71e1653,4bc46d0..39ed804
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -388,13 -388,17 +388,17 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+  

[18/19] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: c9ead4826a1dfb246b4ef6c916106bb13fcdbdc5
Parents: ddefb1d 66e2145
Author: Yuki Morishita 
Authored: Tue Dec 13 15:59:23 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:59:23 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


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

[01/19] cassandra git commit: Temporarily fix bug that creates commit log when running offline tools

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 fb2940050 -> 66f1aaf88
  refs/heads/cassandra-3.0 e9b7a0f25 -> 0fe82be83
  refs/heads/cassandra-3.11 1cafc3ccd -> 66e214592
  refs/heads/cassandra-3.X ddefb1d89 -> c9ead4826
  refs/heads/trunk cd5aacc83 -> 402f8e006


Temporarily fix bug that creates commit log when running offline tools

patch by yukim; reviewed by thobbs for CASSANDRA-8616


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

Branch: refs/heads/cassandra-2.2
Commit: 66f1aaf88d3cde5c52b13d71d3326da5eda16fb1
Parents: fb29400
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 11 19:06:27 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 13 15:51:37 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/compaction/CompactionTask.java | 22 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 36 
 .../io/sstable/format/SSTableReader.java|  8 +++--
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../io/sstable/CQLSSTableWriterLongTest.java|  2 ++
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../config/DatabaseDescriptorTest.java  |  6 
 .../apache/cassandra/db/CounterCellTest.java|  3 ++
 .../org/apache/cassandra/db/NativeCellTest.java |  3 ++
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../service/StorageServiceServerTest.java   |  1 +
 25 files changed, 118 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f02350d..8cff097 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
  * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a3fb79b..35debd0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -102,6 +102,18 @@ public class DatabaseDescriptor
 private static Comparator localComparator;
 private static boolean hasLoggedConfig;
 
+private static boolean daemonInitialized;
+
+public static boolean isDaemonInitialized()
+{
+return daemonInitialized;
+}
+
+public static void setDaemonInitialized()
+{
+daemonInitialized = true;
+}
+
 public static void forceStaticInitialization() {}
 static
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c6b69dc..4bc46d0 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -388,9 +388,13 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 logger.info("Initializing {}.{}", keyspace.getName(), name);
 
-// scan for sstables corresponding to this cf and load them
-

[14/19] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/66e21459
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66e21459
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66e21459

Branch: refs/heads/trunk
Commit: 66e214592875e296bb540a966f1648f1106b2464
Parents: 1cafc3c 0fe82be
Author: Yuki Morishita 
Authored: Tue Dec 13 15:59:14 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:59:14 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/CHANGES.txt
--
diff --cc CHANGES.txt
index 28ebf36,145afb9..f95dd81
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -168,12 -59,6 +168,13 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 881fb00,39ed804..a5f76bd4
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -405,9 -388,13 +405,13 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+ Memtable initialMemtable = null;
+ if (DatabaseDescriptor.isDaemonInitialized())
 -initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);
++initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getCurrentPosition()), this);
+ data = new Tracker(initialMemtable, loadSSTables);
  
+ // scan for sstables corresponding to this cf and load them
  if (data.loadsstables)
  {
  Directories.SSTableLister sstableFiles = 
directories.sstableLister(Directories.OnTxnErr.IGNORE).skipTemporary(true);
@@@ -2118,7 -1957,7 +2122,7 @@@
  {
  public Void call()
  {
- cfs.data.reset();
 -cfs.data.reset(new Memtable(new 
AtomicReference<>(ReplayPosition.NONE), cfs));
++cfs.data.reset(new Memtable(new 
AtomicReference<>(CommitLogPosition.NONE), cfs));
  return null;
  }
  }, true, false);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 50b568e,17adef0..045fc26
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@@ -221,7 -199,8 +221,9 @@@ 

[15/19] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/66e21459
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66e21459
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66e21459

Branch: refs/heads/cassandra-3.X
Commit: 66e214592875e296bb540a966f1648f1106b2464
Parents: 1cafc3c 0fe82be
Author: Yuki Morishita 
Authored: Tue Dec 13 15:59:14 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:59:14 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/CHANGES.txt
--
diff --cc CHANGES.txt
index 28ebf36,145afb9..f95dd81
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -168,12 -59,6 +168,13 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 881fb00,39ed804..a5f76bd4
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -405,9 -388,13 +405,13 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+ Memtable initialMemtable = null;
+ if (DatabaseDescriptor.isDaemonInitialized())
 -initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);
++initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getCurrentPosition()), this);
+ data = new Tracker(initialMemtable, loadSSTables);
  
+ // scan for sstables corresponding to this cf and load them
  if (data.loadsstables)
  {
  Directories.SSTableLister sstableFiles = 
directories.sstableLister(Directories.OnTxnErr.IGNORE).skipTemporary(true);
@@@ -2118,7 -1957,7 +2122,7 @@@
  {
  public Void call()
  {
- cfs.data.reset();
 -cfs.data.reset(new Memtable(new 
AtomicReference<>(ReplayPosition.NONE), cfs));
++cfs.data.reset(new Memtable(new 
AtomicReference<>(CommitLogPosition.NONE), cfs));
  return null;
  }
  }, true, false);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 50b568e,17adef0..045fc26
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@@ -221,7 -199,8 +221,9 

[16/19] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/66e21459
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66e21459
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66e21459

Branch: refs/heads/cassandra-3.11
Commit: 66e214592875e296bb540a966f1648f1106b2464
Parents: 1cafc3c 0fe82be
Author: Yuki Morishita 
Authored: Tue Dec 13 15:59:14 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:59:14 2016 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 ++-
 .../cassandra/db/PartitionRangeReadCommand.java |  4 +-
 .../cassandra/db/compaction/CompactionTask.java | 81 ++--
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 +-
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 +-
 .../cassandra/db/lifecycle/TrackerTest.java |  6 +-
 .../org/apache/cassandra/tools/ToolsTester.java |  3 -
 10 files changed, 85 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/CHANGES.txt
--
diff --cc CHANGES.txt
index 28ebf36,145afb9..f95dd81
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -168,12 -59,6 +168,13 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
 + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
 + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
 + * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
 + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 881fb00,39ed804..a5f76bd4
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -405,9 -388,13 +405,13 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+ Memtable initialMemtable = null;
+ if (DatabaseDescriptor.isDaemonInitialized())
 -initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);
++initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getCurrentPosition()), this);
+ data = new Tracker(initialMemtable, loadSSTables);
  
+ // scan for sstables corresponding to this cf and load them
  if (data.loadsstables)
  {
  Directories.SSTableLister sstableFiles = 
directories.sstableLister(Directories.OnTxnErr.IGNORE).skipTemporary(true);
@@@ -2118,7 -1957,7 +2122,7 @@@
  {
  public Void call()
  {
- cfs.data.reset();
 -cfs.data.reset(new Memtable(new 
AtomicReference<>(ReplayPosition.NONE), cfs));
++cfs.data.reset(new Memtable(new 
AtomicReference<>(CommitLogPosition.NONE), cfs));
  return null;
  }
  }, true, false);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e21459/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 50b568e,17adef0..045fc26
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@@ -221,7 -199,8 +221,9 

[04/19] cassandra git commit: Temporarily fix bug that creates commit log when running offline tools

[yukim]

Temporarily fix bug that creates commit log when running offline tools

patch by yukim; reviewed by thobbs for CASSANDRA-8616


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

Branch: refs/heads/cassandra-3.11
Commit: 66f1aaf88d3cde5c52b13d71d3326da5eda16fb1
Parents: fb29400
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 11 19:06:27 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 13 15:51:37 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/compaction/CompactionTask.java | 22 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 36 
 .../io/sstable/format/SSTableReader.java|  8 +++--
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../io/sstable/CQLSSTableWriterLongTest.java|  2 ++
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../config/DatabaseDescriptorTest.java  |  6 
 .../apache/cassandra/db/CounterCellTest.java|  3 ++
 .../org/apache/cassandra/db/NativeCellTest.java |  3 ++
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../service/StorageServiceServerTest.java   |  1 +
 25 files changed, 118 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f02350d..8cff097 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
  * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a3fb79b..35debd0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -102,6 +102,18 @@ public class DatabaseDescriptor
 private static Comparator localComparator;
 private static boolean hasLoggedConfig;
 
+private static boolean daemonInitialized;
+
+public static boolean isDaemonInitialized()
+{
+return daemonInitialized;
+}
+
+public static void setDaemonInitialized()
+{
+daemonInitialized = true;
+}
+
 public static void forceStaticInitialization() {}
 static
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f1aaf8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c6b69dc..4bc46d0 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -388,9 +388,13 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 logger.info("Initializing {}.{}", keyspace.getName(), name);
 
-// scan for sstables corresponding to this cf and load them
-data = new Tracker(this, loadSSTables);
+// Create Memtable only on online
+Memtable initialMemtable = null;
+if (DatabaseDescriptor.isDaemonInitialized())
+initialMemtable = new Memtable(new 
AtomicReference<>(CommitLog.instance.getContext()), this);

[10/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 003b624,000..a6ed3ba
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@@ -1,1112 -1,0 +1,1114 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.index;
 +
 +import java.lang.reflect.Constructor;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.function.Function;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import com.google.common.base.Joiner;
 +import com.google.common.base.Strings;
 +import com.google.common.collect.ImmutableSet;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Maps;
 +import com.google.common.collect.Sets;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.Futures;
 +import com.google.common.util.concurrent.MoreExecutors;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.ColumnDefinition;
++import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.compaction.CompactionManager;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.lifecycle.View;
 +import org.apache.cassandra.db.partitions.PartitionIterators;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.internal.CassandraIndex;
 +import org.apache.cassandra.index.transactions.*;
 +import org.apache.cassandra.io.sstable.ReducingKeyIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.Indexes;
 +import org.apache.cassandra.service.pager.SinglePartitionPager;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.transport.Server;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.concurrent.Refs;
 +
 +/**
 + * Handles the core maintenance functionality associated with indexes: 
adding/removing them to or from
 + * a table, (re)building during bootstrap or other streaming operations, 
flushing, reloading metadata
 + * and so on.
 + *
 + * The Index interface defines a number of methods which return Callable. 
These are primarily the
 + * management tasks for an index implementation. Most of them are currently 
executed in a blocking
 + * fashion via submission to SIM's blockingExecutor. This provides the 
desired behaviour in pretty
 + * much all cases, as tasks like flushing an index needs to be executed 
synchronously to avoid potentially
 + * deadlocking on the FlushWriter or PostFlusher. Several of these 
Callable returning methods on Index could
 + * then be defined with as void and called directly from SIM (rather than 
being run via the executor service).
 + * Separating the task defintion from execution gives us greater flexibility 
though, so that in future, for example,
 + * if the flush process allows it we leave open the possibility of executing 
more of these tasks asynchronously.
 + *
 + * The primary exception to the above is the Callable returned from 
Index#addIndexedColumn. This may
 + * involve a significant effort, building a new index over any existing data. 
We perform this task asynchronously;
 + * as it is called as part of a schema 

[09/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0fe82be83cceceb12172d63913388678253413bc
Parents: e9b7a0f 66f1aaf
Author: Yuki Morishita 
Authored: Tue Dec 13 15:55:34 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:55:34 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/PartitionRangeReadCommand.java |  3 +-
 .../cassandra/db/compaction/CompactionTask.java | 18 +++
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 ++-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../config/DatabaseDescriptorTest.java  |  6 
 .../org/apache/cassandra/cql3/CQLTester.java|  1 +
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../metrics/HintedHandOffMetricsTest.java   |  7 
 .../service/StorageServiceServerTest.java   |  1 +
 .../concurrent/AbstractTransactionalTest.java   |  7 
 27 files changed, 124 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/CHANGES.txt
--
diff --cc CHANGES.txt
index 5621c93,8cff097..145afb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.9
 +3.0.11
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
   * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
   * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
   * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 71e1653,4bc46d0..39ed804
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -388,13 -388,17 +388,17 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+   

[07/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 0fe82be83cceceb12172d63913388678253413bc
Parents: e9b7a0f 66f1aaf
Author: Yuki Morishita 
Authored: Tue Dec 13 15:55:34 2016 -0800
Committer: Yuki Morishita 
Committed: Tue Dec 13 15:55:34 2016 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java| 12 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 10 --
 .../cassandra/db/PartitionRangeReadCommand.java |  3 +-
 .../cassandra/db/compaction/CompactionTask.java | 18 +++
 .../cassandra/db/lifecycle/LogTransaction.java  |  3 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  | 34 
 .../cassandra/index/SecondaryIndexManager.java  |  4 ++-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../cassandra/service/CassandraDaemon.java  |  1 +
 .../service/EmbeddedCassandraService.java   |  2 ++
 .../config/DatabaseDescriptorTest.java  |  6 
 .../org/apache/cassandra/cql3/CQLTester.java|  1 +
 .../apache/cassandra/db/SystemKeyspaceTest.java |  2 ++
 .../db/context/CounterContextTest.java  |  8 +
 .../db/lifecycle/LifecycleTransactionTest.java  |  5 ++-
 .../cassandra/db/lifecycle/TrackerTest.java |  7 ++--
 .../cassandra/dht/StreamStateStoreTest.java |  7 
 .../cassandra/gms/FailureDetectorTest.java  |  2 ++
 .../org/apache/cassandra/gms/GossiperTest.java  |  5 +++
 .../io/sstable/CQLSSTableWriterTest.java|  2 ++
 .../cassandra/locator/CloudstackSnitchTest.java |  2 ++
 .../apache/cassandra/locator/EC2SnitchTest.java |  2 ++
 .../locator/GoogleCloudSnitchTest.java  |  2 ++
 .../metrics/HintedHandOffMetricsTest.java   |  7 
 .../service/StorageServiceServerTest.java   |  1 +
 .../concurrent/AbstractTransactionalTest.java   |  7 
 27 files changed, 124 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/CHANGES.txt
--
diff --cc CHANGES.txt
index 5621c93,8cff097..145afb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.9
 +3.0.11
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)
   * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
   * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
   * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fe82be8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 71e1653,4bc46d0..39ed804
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -388,13 -388,17 +388,17 @@@ public class ColumnFamilyStore implemen
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);
  
- // scan for sstables corresponding to this cf and load them
- data = new Tracker(this, loadSSTables);
+ // Create Memtable only on online
+ 

[06/22] cassandra git commit: fix SyncRequest.equals wrt ranges

[yukim]

fix SyncRequest.equals wrt ranges


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

Branch: refs/heads/trunk
Commit: 9e2fe3d0bae3bb36157ab43e6485a5d33be2cb41
Parents: 3fd4c68
Author: Dave Brosius 
Authored: Wed Nov 23 18:37:56 2016 -0500
Committer: Dave Brosius 
Committed: Thu Nov 24 00:06:27 2016 -0500

--
 src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e2fe3d0/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
--
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java 
b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index f79f482..e31cc6c 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -69,7 +69,7 @@ public class SyncRequest extends RepairMessage
initiator.equals(req.initiator) &&
src.equals(req.src) &&
dst.equals(req.dst) &&
-   ranges.equals(ranges);
+   ranges.equals(req.ranges);
 }
 
 @Override

[08/22] cassandra git commit: Fix leak on skipped SSTables in sstableupgrade

[yukim]

Fix leak on skipped SSTables in sstableupgrade

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899


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

Branch: refs/heads/cassandra-3.0
Commit: 4fff69fcbe78b118615dfc50fad2acbac5b62566
Parents: 801c1a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 28 16:08:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 28 16:08:42 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2e0ab..cc8ef21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java 
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 2c2a7e0..23342bc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.commons.cli.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -33,6 +32,7 @@ import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.db.compaction.Upgrader;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 import org.apache.cassandra.io.sstable.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.OutputHandler;
 
@@ -83,7 +83,10 @@ public class StandaloneUpgrader
 {
 SSTableReader sstable = 
SSTableReader.openNoValidation(entry.getKey(), components, cfs);
 if 
(sstable.descriptor.version.equals(DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()))
+{
+sstable.selfRef().release();
 continue;
+}
 readers.add(sstable);
 }
 catch (Exception e)
@@ -92,8 +95,6 @@ public class StandaloneUpgrader
 System.err.println(String.format("Error Loading %s: %s", 
entry.getKey(), e.getMessage()));
 if (options.debug)
 e.printStackTrace(System.err);
-
-continue;
 }
 }
 

[12/22] cassandra git commit: Fix leak on skipped SSTables in sstableupgrade

[yukim]

Fix leak on skipped SSTables in sstableupgrade

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899


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

Branch: refs/heads/cassandra-2.2
Commit: 4fff69fcbe78b118615dfc50fad2acbac5b62566
Parents: 801c1a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 28 16:08:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 28 16:08:42 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2e0ab..cc8ef21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java 
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 2c2a7e0..23342bc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.commons.cli.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -33,6 +32,7 @@ import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.db.compaction.Upgrader;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 import org.apache.cassandra.io.sstable.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.OutputHandler;
 
@@ -83,7 +83,10 @@ public class StandaloneUpgrader
 {
 SSTableReader sstable = 
SSTableReader.openNoValidation(entry.getKey(), components, cfs);
 if 
(sstable.descriptor.version.equals(DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()))
+{
+sstable.selfRef().release();
 continue;
+}
 readers.add(sstable);
 }
 catch (Exception e)
@@ -92,8 +95,6 @@ public class StandaloneUpgrader
 System.err.println(String.format("Error Loading %s: %s", 
entry.getKey(), e.getMessage()));
 if (options.debug)
 e.printStackTrace(System.err);
-
-continue;
 }
 }
 

[19/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/2b65b0d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b65b0d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b65b0d8

Branch: refs/heads/cassandra-3.X
Commit: 2b65b0d8bfd9af2a71c0301612af7ad132487bec
Parents: 12c63cf 7dd609c
Author: Yuki Morishita 
Authored: Mon Nov 28 16:20:59 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:20:59 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b65b0d8/CHANGES.txt
--
diff --cc CHANGES.txt
index 9be3e7c,a2c552e..080de28
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,21 +1,122 @@@
 -3.0.11
 +3.11
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 - * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 - * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 -
  
 -3.0.10
 - * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 +3.10
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries 

[04/22] cassandra git commit: Fixing double division and rounding.

[yukim]

Fixing double division and rounding.

Patch by Per Otterstrom; reviewed by dbrosius for CASSANDRA-11752


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

Branch: refs/heads/trunk
Commit: 801c1a5942dc986dc3b63aa35416d586df5cf225
Parents: 9cd7d54
Author: Per Otterstrom 
Authored: Tue Aug 30 22:33:49 2016 -0400
Committer: Dave Brosius 
Committed: Wed Nov 23 18:25:08 2016 -0500

--
 .../metrics/DecayingEstimatedHistogramReservoir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c1a59/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
--
diff --git 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 14a4366..2458164 100644
--- 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -179,7 +179,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-decayingBuckets.getAndAdd(index, forwardDecayWeight(now));
+decayingBuckets.getAndAdd(index, 
Math.round(forwardDecayWeight(now)));
 }
 finally
 {
@@ -189,9 +189,9 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 buckets.getAndIncrement(index);
 }
 
-private long forwardDecayWeight(long now)
+private double forwardDecayWeight(long now)
 {
-return Math.round(Math.exp(((now - decayLandmark) / 1000L) / 
MEAN_LIFETIME_IN_S));
+return Math.exp(((now - decayLandmark) / 1000L) / MEAN_LIFETIME_IN_S);
 }
 
 /**
@@ -270,7 +270,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-final long rescaleFactor = forwardDecayWeight(now);
+final double rescaleFactor = forwardDecayWeight(now);
 decayLandmark = now;
 
 final int bucketCount = decayingBuckets.length();

[10/22] cassandra git commit: Fix leak on skipped SSTables in sstableupgrade

[yukim]

Fix leak on skipped SSTables in sstableupgrade

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899


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

Branch: refs/heads/cassandra-3.X
Commit: 4fff69fcbe78b118615dfc50fad2acbac5b62566
Parents: 801c1a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 28 16:08:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 28 16:08:42 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2e0ab..cc8ef21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java 
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 2c2a7e0..23342bc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.commons.cli.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -33,6 +32,7 @@ import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.db.compaction.Upgrader;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 import org.apache.cassandra.io.sstable.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.OutputHandler;
 
@@ -83,7 +83,10 @@ public class StandaloneUpgrader
 {
 SSTableReader sstable = 
SSTableReader.openNoValidation(entry.getKey(), components, cfs);
 if 
(sstable.descriptor.version.equals(DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()))
+{
+sstable.selfRef().release();
 continue;
+}
 readers.add(sstable);
 }
 catch (Exception e)
@@ -92,8 +95,6 @@ public class StandaloneUpgrader
 System.err.println(String.format("Error Loading %s: %s", 
entry.getKey(), e.getMessage()));
 if (options.debug)
 e.printStackTrace(System.err);
-
-continue;
 }
 }
 

[09/22] cassandra git commit: Fix leak on skipped SSTables in sstableupgrade

[yukim]

Fix leak on skipped SSTables in sstableupgrade

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899


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

Branch: refs/heads/cassandra-3.11
Commit: 4fff69fcbe78b118615dfc50fad2acbac5b62566
Parents: 801c1a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 28 16:08:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 28 16:08:42 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2e0ab..cc8ef21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java 
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 2c2a7e0..23342bc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.commons.cli.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -33,6 +32,7 @@ import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.db.compaction.Upgrader;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 import org.apache.cassandra.io.sstable.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.OutputHandler;
 
@@ -83,7 +83,10 @@ public class StandaloneUpgrader
 {
 SSTableReader sstable = 
SSTableReader.openNoValidation(entry.getKey(), components, cfs);
 if 
(sstable.descriptor.version.equals(DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()))
+{
+sstable.selfRef().release();
 continue;
+}
 readers.add(sstable);
 }
 catch (Exception e)
@@ -92,8 +95,6 @@ public class StandaloneUpgrader
 System.err.println(String.format("Error Loading %s: %s", 
entry.getKey(), e.getMessage()));
 if (options.debug)
 e.printStackTrace(System.err);
-
-continue;
 }
 }
 

[21/22] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: bf97b8507618145a9da7fb088e1ae4463c047f5a
Parents: f60ab23 2b65b0d
Author: Yuki Morishita 
Authored: Mon Nov 28 16:21:12 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:21:12 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


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

[22/22] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/b7ccd518
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ccd518
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ccd518

Branch: refs/heads/trunk
Commit: b7ccd518c941eb95a8accd942c31950befea5c3e
Parents: b93e96a bf97b85
Author: Yuki Morishita 
Authored: Mon Nov 28 16:22:32 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:22:32 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


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

[17/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/2b65b0d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b65b0d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b65b0d8

Branch: refs/heads/cassandra-3.11
Commit: 2b65b0d8bfd9af2a71c0301612af7ad132487bec
Parents: 12c63cf 7dd609c
Author: Yuki Morishita 
Authored: Mon Nov 28 16:20:59 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:20:59 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b65b0d8/CHANGES.txt
--
diff --cc CHANGES.txt
index 9be3e7c,a2c552e..080de28
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,21 +1,122 @@@
 -3.0.11
 +3.11
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 - * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 - * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 -
  
 -3.0.10
 - * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 +3.10
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for 

[02/22] cassandra git commit: Fixing double division and rounding.

[yukim]

Fixing double division and rounding.

Patch by Per Otterstrom; reviewed by dbrosius for CASSANDRA-11752


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

Branch: refs/heads/cassandra-3.X
Commit: 801c1a5942dc986dc3b63aa35416d586df5cf225
Parents: 9cd7d54
Author: Per Otterstrom 
Authored: Tue Aug 30 22:33:49 2016 -0400
Committer: Dave Brosius 
Committed: Wed Nov 23 18:25:08 2016 -0500

--
 .../metrics/DecayingEstimatedHistogramReservoir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c1a59/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
--
diff --git 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 14a4366..2458164 100644
--- 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -179,7 +179,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-decayingBuckets.getAndAdd(index, forwardDecayWeight(now));
+decayingBuckets.getAndAdd(index, 
Math.round(forwardDecayWeight(now)));
 }
 finally
 {
@@ -189,9 +189,9 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 buckets.getAndIncrement(index);
 }
 
-private long forwardDecayWeight(long now)
+private double forwardDecayWeight(long now)
 {
-return Math.round(Math.exp(((now - decayLandmark) / 1000L) / 
MEAN_LIFETIME_IN_S));
+return Math.exp(((now - decayLandmark) / 1000L) / MEAN_LIFETIME_IN_S);
 }
 
 /**
@@ -270,7 +270,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-final long rescaleFactor = forwardDecayWeight(now);
+final double rescaleFactor = forwardDecayWeight(now);
 decayLandmark = now;
 
 final int bucketCount = decayingBuckets.length();

[20/22] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: bf97b8507618145a9da7fb088e1ae4463c047f5a
Parents: f60ab23 2b65b0d
Author: Yuki Morishita 
Authored: Mon Nov 28 16:21:12 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:21:12 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


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

[05/22] cassandra git commit: fix SyncRequest.equals wrt ranges

[yukim]

fix SyncRequest.equals wrt ranges


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

Branch: refs/heads/cassandra-3.X
Commit: 9e2fe3d0bae3bb36157ab43e6485a5d33be2cb41
Parents: 3fd4c68
Author: Dave Brosius 
Authored: Wed Nov 23 18:37:56 2016 -0500
Committer: Dave Brosius 
Committed: Thu Nov 24 00:06:27 2016 -0500

--
 src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e2fe3d0/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
--
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java 
b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index f79f482..e31cc6c 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -69,7 +69,7 @@ public class SyncRequest extends RepairMessage
initiator.equals(req.initiator) &&
src.equals(req.src) &&
dst.equals(req.dst) &&
-   ranges.equals(ranges);
+   ranges.equals(req.ranges);
 }
 
 @Override

[15/22] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7dd609c8f0b67f48b6f93c79fd568adfbe19dee3
Parents: 9e2fe3d 4fff69f
Author: Yuki Morishita 
Authored: Mon Nov 28 16:09:25 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:09:25 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/CHANGES.txt
--
diff --cc CHANGES.txt
index e613d7c,cc8ef21..a2c552e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,6 +1,47 @@@
 -2.2.9
 +3.0.11
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--

[13/22] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7dd609c8f0b67f48b6f93c79fd568adfbe19dee3
Parents: 9e2fe3d 4fff69f
Author: Yuki Morishita 
Authored: Mon Nov 28 16:09:25 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:09:25 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/CHANGES.txt
--
diff --cc CHANGES.txt
index e613d7c,cc8ef21..a2c552e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,6 +1,47 @@@
 -2.2.9
 +3.0.11
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--

[07/22] cassandra git commit: fix SyncRequest.equals wrt ranges

[yukim]

fix SyncRequest.equals wrt ranges


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

Branch: refs/heads/cassandra-3.11
Commit: 9e2fe3d0bae3bb36157ab43e6485a5d33be2cb41
Parents: 3fd4c68
Author: Dave Brosius 
Authored: Wed Nov 23 18:37:56 2016 -0500
Committer: Dave Brosius 
Committed: Thu Nov 24 00:06:27 2016 -0500

--
 src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e2fe3d0/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
--
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java 
b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index f79f482..e31cc6c 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -69,7 +69,7 @@ public class SyncRequest extends RepairMessage
initiator.equals(req.initiator) &&
src.equals(req.src) &&
dst.equals(req.dst) &&
-   ranges.equals(ranges);
+   ranges.equals(req.ranges);
 }
 
 @Override

[01/22] cassandra git commit: Fixing double division and rounding.

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 801c1a594 -> 4fff69fcb
  refs/heads/cassandra-3.0 9e2fe3d0b -> 7dd609c8f
  refs/heads/cassandra-3.11 12c63cf4a -> 2b65b0d8b
  refs/heads/cassandra-3.X f60ab2373 -> bf97b8507
  refs/heads/trunk b93e96a9e -> b7ccd518c


Fixing double division and rounding.

Patch by Per Otterstrom; reviewed by dbrosius for CASSANDRA-11752


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

Branch: refs/heads/cassandra-3.0
Commit: 801c1a5942dc986dc3b63aa35416d586df5cf225
Parents: 9cd7d54
Author: Per Otterstrom 
Authored: Tue Aug 30 22:33:49 2016 -0400
Committer: Dave Brosius 
Committed: Wed Nov 23 18:25:08 2016 -0500

--
 .../metrics/DecayingEstimatedHistogramReservoir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c1a59/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
--
diff --git 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 14a4366..2458164 100644
--- 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -179,7 +179,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-decayingBuckets.getAndAdd(index, forwardDecayWeight(now));
+decayingBuckets.getAndAdd(index, 
Math.round(forwardDecayWeight(now)));
 }
 finally
 {
@@ -189,9 +189,9 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 buckets.getAndIncrement(index);
 }
 
-private long forwardDecayWeight(long now)
+private double forwardDecayWeight(long now)
 {
-return Math.round(Math.exp(((now - decayLandmark) / 1000L) / 
MEAN_LIFETIME_IN_S));
+return Math.exp(((now - decayLandmark) / 1000L) / MEAN_LIFETIME_IN_S);
 }
 
 /**
@@ -270,7 +270,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-final long rescaleFactor = forwardDecayWeight(now);
+final double rescaleFactor = forwardDecayWeight(now);
 decayLandmark = now;
 
 final int bucketCount = decayingBuckets.length();

[16/22] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 7dd609c8f0b67f48b6f93c79fd568adfbe19dee3
Parents: 9e2fe3d 4fff69f
Author: Yuki Morishita 
Authored: Mon Nov 28 16:09:25 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:09:25 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/CHANGES.txt
--
diff --cc CHANGES.txt
index e613d7c,cc8ef21..a2c552e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,6 +1,47 @@@
 -2.2.9
 +3.0.11
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--

[11/22] cassandra git commit: Fix leak on skipped SSTables in sstableupgrade

[yukim]

Fix leak on skipped SSTables in sstableupgrade

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899


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

Branch: refs/heads/trunk
Commit: 4fff69fcbe78b118615dfc50fad2acbac5b62566
Parents: 801c1a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 28 16:08:42 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 28 16:08:42 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2e0ab..cc8ef21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fff69fc/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java 
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 2c2a7e0..23342bc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tools;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.commons.cli.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -33,6 +32,7 @@ import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.db.compaction.Upgrader;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 import org.apache.cassandra.io.sstable.*;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.OutputHandler;
 
@@ -83,7 +83,10 @@ public class StandaloneUpgrader
 {
 SSTableReader sstable = 
SSTableReader.openNoValidation(entry.getKey(), components, cfs);
 if 
(sstable.descriptor.version.equals(DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()))
+{
+sstable.selfRef().release();
 continue;
+}
 readers.add(sstable);
 }
 catch (Exception e)
@@ -92,8 +95,6 @@ public class StandaloneUpgrader
 System.err.println(String.format("Error Loading %s: %s", 
entry.getKey(), e.getMessage()));
 if (options.debug)
 e.printStackTrace(System.err);
-
-continue;
 }
 }
 

[18/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

[yukim]

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/2b65b0d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b65b0d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b65b0d8

Branch: refs/heads/trunk
Commit: 2b65b0d8bfd9af2a71c0301612af7ad132487bec
Parents: 12c63cf 7dd609c
Author: Yuki Morishita 
Authored: Mon Nov 28 16:20:59 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:20:59 2016 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/tools/StandaloneUpgrader.java| 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b65b0d8/CHANGES.txt
--
diff --cc CHANGES.txt
index 9be3e7c,a2c552e..080de28
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,120 -1,21 +1,122 @@@
 -3.0.11
 +3.11
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 - * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 - * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 -
  
 -3.0.10
 - * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 +3.10
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without 

[14/22] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 7dd609c8f0b67f48b6f93c79fd568adfbe19dee3
Parents: 9e2fe3d 4fff69f
Author: Yuki Morishita 
Authored: Mon Nov 28 16:09:25 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Nov 28 16:09:25 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/CHANGES.txt
--
diff --cc CHANGES.txt
index e613d7c,cc8ef21..a2c552e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,6 +1,47 @@@
 -2.2.9
 +3.0.11
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dd609c8/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--

[03/22] cassandra git commit: Fixing double division and rounding.

[yukim]

Fixing double division and rounding.

Patch by Per Otterstrom; reviewed by dbrosius for CASSANDRA-11752


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

Branch: refs/heads/cassandra-3.11
Commit: 801c1a5942dc986dc3b63aa35416d586df5cf225
Parents: 9cd7d54
Author: Per Otterstrom 
Authored: Tue Aug 30 22:33:49 2016 -0400
Committer: Dave Brosius 
Committed: Wed Nov 23 18:25:08 2016 -0500

--
 .../metrics/DecayingEstimatedHistogramReservoir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c1a59/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
--
diff --git 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 14a4366..2458164 100644
--- 
a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ 
b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -179,7 +179,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-decayingBuckets.getAndAdd(index, forwardDecayWeight(now));
+decayingBuckets.getAndAdd(index, 
Math.round(forwardDecayWeight(now)));
 }
 finally
 {
@@ -189,9 +189,9 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 buckets.getAndIncrement(index);
 }
 
-private long forwardDecayWeight(long now)
+private double forwardDecayWeight(long now)
 {
-return Math.round(Math.exp(((now - decayLandmark) / 1000L) / 
MEAN_LIFETIME_IN_S));
+return Math.exp(((now - decayLandmark) / 1000L) / MEAN_LIFETIME_IN_S);
 }
 
 /**
@@ -270,7 +270,7 @@ public class DecayingEstimatedHistogramReservoir implements 
Reservoir
 
 try
 {
-final long rescaleFactor = forwardDecayWeight(now);
+final double rescaleFactor = forwardDecayWeight(now);
 decayLandmark = now;
 
 final int bucketCount = decayingBuckets.length();

[02/10] cassandra git commit: Fail repair if participant dies during sync or anticompaction

[yukim]

Fail repair if participant dies during sync or anticompaction

Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12901

This reverts the behavior of repair relying exclusively on TCP keep-alive to
detect node failures during sync introduced by CASSANDRA-3569.


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

Branch: refs/heads/cassandra-3.0
Commit: 84b9e72788816b571cb50404ccb9fb9b5f19ba4f
Parents: ebf3507
Author: Paulo Motta 
Authored: Mon Nov 14 18:56:16 2016 -0200
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:20:46 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c1839..3482052 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
  * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
  * Fix Util.spinAssertEquals (CASSANDRA-12283)
  * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --git a/src/java/org/apache/cassandra/repair/AnticompactionTask.java 
b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 8ecae23..c5e066d 100644
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@ -22,30 +22,43 @@ import java.net.InetAddress;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+import org.apache.cassandra.gms.IFailureDetectionEventListener;
+import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.net.IAsyncCallbackWithFailure;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.repair.messages.AnticompactionRequest;
 import org.apache.cassandra.utils.CassandraVersion;
 
-public class AnticompactionTask extends AbstractFuture implements 
Runnable
+public class AnticompactionTask extends AbstractFuture implements 
Runnable, IEndpointStateChangeSubscriber,
+   
IFailureDetectionEventListener
 {
 /*
  * Version that anticompaction response is not supported up to.
  * If Cassandra version is more than this, we need to wait for 
anticompaction response.
  */
 private static final CassandraVersion VERSION_CHECKER = new 
CassandraVersion("2.1.5");
+private static Logger logger = 
LoggerFactory.getLogger(RepairSession.class);
 
 private final UUID parentSession;
 private final InetAddress neighbor;
 private final Collection successfulRanges;
+private final AtomicBoolean isFinished = new AtomicBoolean(false);
 
 public AnticompactionTask(UUID parentSession, InetAddress neighbor, 
Collection successfulRanges)
 {
@@ -66,21 +79,41 @@ public class AnticompactionTask extends 
AbstractFuture implements R
 }
 else
 {
-MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
 // immediately return after sending request
-set(neighbor);
+MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
+maybeSetResult(neighbor);
 }
 }
 else
 {
-setException(new IOException(neighbor + 

[04/10] cassandra git commit: Fail repair if participant dies during sync or anticompaction

[yukim]

Fail repair if participant dies during sync or anticompaction

Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12901

This reverts the behavior of repair relying exclusively on TCP keep-alive to
detect node failures during sync introduced by CASSANDRA-3569.


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

Branch: refs/heads/trunk
Commit: 84b9e72788816b571cb50404ccb9fb9b5f19ba4f
Parents: ebf3507
Author: Paulo Motta 
Authored: Mon Nov 14 18:56:16 2016 -0200
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:20:46 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c1839..3482052 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
  * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
  * Fix Util.spinAssertEquals (CASSANDRA-12283)
  * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --git a/src/java/org/apache/cassandra/repair/AnticompactionTask.java 
b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 8ecae23..c5e066d 100644
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@ -22,30 +22,43 @@ import java.net.InetAddress;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+import org.apache.cassandra.gms.IFailureDetectionEventListener;
+import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.net.IAsyncCallbackWithFailure;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.repair.messages.AnticompactionRequest;
 import org.apache.cassandra.utils.CassandraVersion;
 
-public class AnticompactionTask extends AbstractFuture implements 
Runnable
+public class AnticompactionTask extends AbstractFuture implements 
Runnable, IEndpointStateChangeSubscriber,
+   
IFailureDetectionEventListener
 {
 /*
  * Version that anticompaction response is not supported up to.
  * If Cassandra version is more than this, we need to wait for 
anticompaction response.
  */
 private static final CassandraVersion VERSION_CHECKER = new 
CassandraVersion("2.1.5");
+private static Logger logger = 
LoggerFactory.getLogger(RepairSession.class);
 
 private final UUID parentSession;
 private final InetAddress neighbor;
 private final Collection successfulRanges;
+private final AtomicBoolean isFinished = new AtomicBoolean(false);
 
 public AnticompactionTask(UUID parentSession, InetAddress neighbor, 
Collection successfulRanges)
 {
@@ -66,21 +79,41 @@ public class AnticompactionTask extends 
AbstractFuture implements R
 }
 else
 {
-MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
 // immediately return after sending request
-set(neighbor);
+MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
+maybeSetResult(neighbor);
 }
 }
 else
 {
-setException(new IOException(neighbor + " is 

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: a1eef56cc021772619eeb4a048cb785078547515
Parents: 0cb3128 14f36fc
Author: Yuki Morishita 
Authored: Wed Nov 16 17:24:29 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 17:24:29 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --cc src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 16a0a12,c5e066d..bc09b38
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@@ -28,8 -33,12 +33,13 @@@ import org.apache.cassandra.config.Data
  import org.apache.cassandra.db.SystemKeyspace;
  import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.exceptions.RequestFailureReason;
+ import org.apache.cassandra.gms.ApplicationState;
+ import org.apache.cassandra.gms.EndpointState;
  import org.apache.cassandra.gms.FailureDetector;
+ import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+ import org.apache.cassandra.gms.IFailureDetectionEventListener;
+ import org.apache.cassandra.gms.VersionedValue;
  import org.apache.cassandra.net.IAsyncCallbackWithFailure;
  import org.apache.cassandra.net.MessageIn;
  import org.apache.cassandra.net.MessagingService;
@@@ -100,9 -132,42 +133,42 @@@ public class AnticompactionTask extend
  return false;
  }
  
 -public void onFailure(InetAddress from)
 +public void onFailure(InetAddress from, RequestFailureReason 
failureReason)
  {
- task.setException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ maybeSetException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ }
+ }
+ 
+ public void onJoin(InetAddress endpoint, EndpointState epState) {}
+ public void beforeChange(InetAddress endpoint, EndpointState 
currentState, ApplicationState newStateKey, VersionedValue newValue) {}
+ public void onChange(InetAddress endpoint, ApplicationState state, 
VersionedValue value) {}
+ public void onAlive(InetAddress endpoint, EndpointState state) {}
+ public void onDead(InetAddress endpoint, EndpointState state) {}
+ 
+ public void onRemove(InetAddress endpoint)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void onRestart(InetAddress endpoint, EndpointState epState)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void convict(InetAddress endpoint, double phi)
+ {
+ if (!neighbor.equals(endpoint))
+ return;
+ 
+ // We want a higher confidence in the failure detection than usual 
because failing a repair wrongly has a high cost.
+ if (phi < 2 * DatabaseDescriptor.getPhiConvictThreshold())
+ return;
+ 
+ Exception exception = new IOException(String.format("Endpoint %s died 
during anti-compaction.", endpoint));
+ if (maybeSetException(exception))
+ {
+ // Though unlikely, it is possible to arrive here multiple time 
and we want to avoid print an error message twice
+ logger.error("[repair #{}] Endpoint {} died during 
anti-compaction", endpoint, parentSession, exception);
  }
  }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index 528115a,5fe306d..00340a1
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -141,8 -134,6 +137,7 @@@ public class RepairSession extends Abst
  this.ranges = ranges;
  this.endpoints = endpoints;
  this.repairedAt = repairedAt;
- 

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 14f36fce33da265db479ce9dc0067e1e073c48d8
Parents: ac279e2 84b9e72
Author: Yuki Morishita 
Authored: Wed Nov 16 15:24:34 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:24:34 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/CHANGES.txt
--
diff --cc CHANGES.txt
index 00f9574,3482052..efc681d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,5 +1,43 @@@
 -2.2.9
 +3.0.11
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
   * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index a52b352,70bfaa6..5fe306d
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -88,13 -87,10 +87,10 @@@ public class RepairSession extends Abst
  private final String[] cfnames;
  public final RepairParallelism parallelismDegree;
  /** 

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: a1eef56cc021772619eeb4a048cb785078547515
Parents: 0cb3128 14f36fc
Author: Yuki Morishita 
Authored: Wed Nov 16 17:24:29 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 17:24:29 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --cc src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 16a0a12,c5e066d..bc09b38
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@@ -28,8 -33,12 +33,13 @@@ import org.apache.cassandra.config.Data
  import org.apache.cassandra.db.SystemKeyspace;
  import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.exceptions.RequestFailureReason;
+ import org.apache.cassandra.gms.ApplicationState;
+ import org.apache.cassandra.gms.EndpointState;
  import org.apache.cassandra.gms.FailureDetector;
+ import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+ import org.apache.cassandra.gms.IFailureDetectionEventListener;
+ import org.apache.cassandra.gms.VersionedValue;
  import org.apache.cassandra.net.IAsyncCallbackWithFailure;
  import org.apache.cassandra.net.MessageIn;
  import org.apache.cassandra.net.MessagingService;
@@@ -100,9 -132,42 +133,42 @@@ public class AnticompactionTask extend
  return false;
  }
  
 -public void onFailure(InetAddress from)
 +public void onFailure(InetAddress from, RequestFailureReason 
failureReason)
  {
- task.setException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ maybeSetException(new RuntimeException("Anticompaction failed or 
timed out in " + from));
+ }
+ }
+ 
+ public void onJoin(InetAddress endpoint, EndpointState epState) {}
+ public void beforeChange(InetAddress endpoint, EndpointState 
currentState, ApplicationState newStateKey, VersionedValue newValue) {}
+ public void onChange(InetAddress endpoint, ApplicationState state, 
VersionedValue value) {}
+ public void onAlive(InetAddress endpoint, EndpointState state) {}
+ public void onDead(InetAddress endpoint, EndpointState state) {}
+ 
+ public void onRemove(InetAddress endpoint)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void onRestart(InetAddress endpoint, EndpointState epState)
+ {
+ convict(endpoint, Double.MAX_VALUE);
+ }
+ 
+ public void convict(InetAddress endpoint, double phi)
+ {
+ if (!neighbor.equals(endpoint))
+ return;
+ 
+ // We want a higher confidence in the failure detection than usual 
because failing a repair wrongly has a high cost.
+ if (phi < 2 * DatabaseDescriptor.getPhiConvictThreshold())
+ return;
+ 
+ Exception exception = new IOException(String.format("Endpoint %s died 
during anti-compaction.", endpoint));
+ if (maybeSetException(exception))
+ {
+ // Though unlikely, it is possible to arrive here multiple time 
and we want to avoid print an error message twice
+ logger.error("[repair #{}] Endpoint {} died during 
anti-compaction", endpoint, parentSession, exception);
  }
  }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1eef56c/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index 528115a,5fe306d..00340a1
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -141,8 -134,6 +137,7 @@@ public class RepairSession extends Abst
  this.ranges = ranges;
  this.endpoints = endpoints;
  this.repairedAt = repairedAt;
- 

[10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/732af7de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/732af7de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/732af7de

Branch: refs/heads/trunk
Commit: 732af7de7f4b7865c00dfa0d85e4dbf4ee9900e2
Parents: fd7857a a1eef56
Author: Yuki Morishita 
Authored: Wed Nov 16 17:24:41 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 17:24:41 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


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

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 14f36fce33da265db479ce9dc0067e1e073c48d8
Parents: ac279e2 84b9e72
Author: Yuki Morishita 
Authored: Wed Nov 16 15:24:34 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:24:34 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/CHANGES.txt
--
diff --cc CHANGES.txt
index 00f9574,3482052..efc681d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,5 +1,43 @@@
 -2.2.9
 +3.0.11
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
   * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index a52b352,70bfaa6..5fe306d
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -88,13 -87,10 +87,10 @@@ public class RepairSession extends Abst
  private final String[] cfnames;
  public final RepairParallelism parallelismDegree;
   

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 14f36fce33da265db479ce9dc0067e1e073c48d8
Parents: ac279e2 84b9e72
Author: Yuki Morishita 
Authored: Wed Nov 16 15:24:34 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:24:34 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/CHANGES.txt
--
diff --cc CHANGES.txt
index 00f9574,3482052..efc681d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,5 +1,43 @@@
 -2.2.9
 +3.0.11
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
   * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14f36fce/src/java/org/apache/cassandra/repair/RepairSession.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairSession.java
index a52b352,70bfaa6..5fe306d
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@@ -88,13 -87,10 +87,10 @@@ public class RepairSession extends Abst
  private final String[] cfnames;
  public final RepairParallelism parallelismDegree;
   

[01/10] cassandra git commit: Fail repair if participant dies during sync or anticompaction

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ebf350740 -> 84b9e7278
  refs/heads/cassandra-3.0 ac279e2f7 -> 14f36fce3
  refs/heads/cassandra-3.X 0cb3128f6 -> a1eef56cc
  refs/heads/trunk fd7857a64 -> 732af7de7


Fail repair if participant dies during sync or anticompaction

Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12901

This reverts the behavior of repair relying exclusively on TCP keep-alive to
detect node failures during sync introduced by CASSANDRA-3569.


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

Branch: refs/heads/cassandra-2.2
Commit: 84b9e72788816b571cb50404ccb9fb9b5f19ba4f
Parents: ebf3507
Author: Paulo Motta 
Authored: Mon Nov 14 18:56:16 2016 -0200
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:20:46 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c1839..3482052 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
  * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
  * Fix Util.spinAssertEquals (CASSANDRA-12283)
  * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --git a/src/java/org/apache/cassandra/repair/AnticompactionTask.java 
b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 8ecae23..c5e066d 100644
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@ -22,30 +22,43 @@ import java.net.InetAddress;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+import org.apache.cassandra.gms.IFailureDetectionEventListener;
+import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.net.IAsyncCallbackWithFailure;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.repair.messages.AnticompactionRequest;
 import org.apache.cassandra.utils.CassandraVersion;
 
-public class AnticompactionTask extends AbstractFuture implements 
Runnable
+public class AnticompactionTask extends AbstractFuture implements 
Runnable, IEndpointStateChangeSubscriber,
+   
IFailureDetectionEventListener
 {
 /*
  * Version that anticompaction response is not supported up to.
  * If Cassandra version is more than this, we need to wait for 
anticompaction response.
  */
 private static final CassandraVersion VERSION_CHECKER = new 
CassandraVersion("2.1.5");
+private static Logger logger = 
LoggerFactory.getLogger(RepairSession.class);
 
 private final UUID parentSession;
 private final InetAddress neighbor;
 private final Collection successfulRanges;
+private final AtomicBoolean isFinished = new AtomicBoolean(false);
 
 public AnticompactionTask(UUID parentSession, InetAddress neighbor, 
Collection successfulRanges)
 {
@@ -66,21 +79,41 @@ public class AnticompactionTask extends 
AbstractFuture implements R
 }
 else
 {
-MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
 // immediately return after sending request
-set(neighbor);
+ 

[03/10] cassandra git commit: Fail repair if participant dies during sync or anticompaction

[yukim]

Fail repair if participant dies during sync or anticompaction

Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12901

This reverts the behavior of repair relying exclusively on TCP keep-alive to
detect node failures during sync introduced by CASSANDRA-3569.


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

Branch: refs/heads/cassandra-3.X
Commit: 84b9e72788816b571cb50404ccb9fb9b5f19ba4f
Parents: ebf3507
Author: Paulo Motta 
Authored: Mon Nov 14 18:56:16 2016 -0200
Committer: Yuki Morishita 
Committed: Wed Nov 16 15:20:46 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/repair/AnticompactionTask.java| 80 ++--
 .../apache/cassandra/repair/RepairSession.java  | 13 
 .../cassandra/service/ActiveRepairService.java  | 30 ++--
 4 files changed, 99 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 98c1839..3482052 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
  * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)
  * Fix Util.spinAssertEquals (CASSANDRA-12283)
  * Fix potential NPE for compactionstats (CASSANDRA-12462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9e727/src/java/org/apache/cassandra/repair/AnticompactionTask.java
--
diff --git a/src/java/org/apache/cassandra/repair/AnticompactionTask.java 
b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
index 8ecae23..c5e066d 100644
--- a/src/java/org/apache/cassandra/repair/AnticompactionTask.java
+++ b/src/java/org/apache/cassandra/repair/AnticompactionTask.java
@@ -22,30 +22,43 @@ import java.net.InetAddress;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
+import org.apache.cassandra.gms.IFailureDetectionEventListener;
+import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.net.IAsyncCallbackWithFailure;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.repair.messages.AnticompactionRequest;
 import org.apache.cassandra.utils.CassandraVersion;
 
-public class AnticompactionTask extends AbstractFuture implements 
Runnable
+public class AnticompactionTask extends AbstractFuture implements 
Runnable, IEndpointStateChangeSubscriber,
+   
IFailureDetectionEventListener
 {
 /*
  * Version that anticompaction response is not supported up to.
  * If Cassandra version is more than this, we need to wait for 
anticompaction response.
  */
 private static final CassandraVersion VERSION_CHECKER = new 
CassandraVersion("2.1.5");
+private static Logger logger = 
LoggerFactory.getLogger(RepairSession.class);
 
 private final UUID parentSession;
 private final InetAddress neighbor;
 private final Collection successfulRanges;
+private final AtomicBoolean isFinished = new AtomicBoolean(false);
 
 public AnticompactionTask(UUID parentSession, InetAddress neighbor, 
Collection successfulRanges)
 {
@@ -66,21 +79,41 @@ public class AnticompactionTask extends 
AbstractFuture implements R
 }
 else
 {
-MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
 // immediately return after sending request
-set(neighbor);
+MessagingService.instance().sendOneWay(acr.createMessage(), 
neighbor);
+maybeSetResult(neighbor);
 }
 }
 else
 {
-setException(new IOException(neighbor + 

[3/6] cassandra git commit: Pass root cause to CorruptBlockException when uncompression failed

[yukim]

Pass root cause to CorruptBlockException when uncompression failed

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12889


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

Branch: refs/heads/trunk
Commit: c39a9b08d94ebcb22e6f4e400fc79f169564b3ce
Parents: 9d90b4e
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Nov 9 11:43:10 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Nov 10 09:30:09 2016 -0600

--
 CHANGES.txt  | 1 +
 .../cassandra/io/compress/CompressedRandomAccessReader.java  | 4 ++--
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f0e201..9598546 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
  * Fix partition count log during compaction (CASSANDRA-12184)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index 329d932..0624e89 100644
--- 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -122,7 +122,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {
@@ -184,7 +184,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9bd1145..74258cf 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -203,7 +203,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize);
+throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize, e);
 }
 
 CRC32 checksum = new CRC32();

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 0dc8440efb90a71d3a91374c682dfc4bfc61c672
Parents: a07d7ac c39a9b0
Author: Yuki Morishita 
Authored: Thu Nov 10 09:34:28 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Nov 10 09:34:28 2016 -0600

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 src/java/org/apache/cassandra/io/util/CompressedChunkReader.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dc8440e/CHANGES.txt
--
diff --cc CHANGES.txt
index dd9088b,9598546..e765a9c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,111 -1,14 +1,112 @@@
 -3.0.11
 +3.10
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
 + * avoid deleting non existing sstable files and improve related log messages 
(CASSANDRA-12261)
 + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
 + * Retry all internode messages once after a connection is
 +   closed and reopened (CASSANDRA-12192)
 + * Add support to 

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 0dc8440efb90a71d3a91374c682dfc4bfc61c672
Parents: a07d7ac c39a9b0
Author: Yuki Morishita 
Authored: Thu Nov 10 09:34:28 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Nov 10 09:34:28 2016 -0600

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 src/java/org/apache/cassandra/io/util/CompressedChunkReader.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dc8440e/CHANGES.txt
--
diff --cc CHANGES.txt
index dd9088b,9598546..e765a9c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,111 -1,14 +1,112 @@@
 -3.0.11
 +3.10
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
 + * avoid deleting non existing sstable files and improve related log messages 
(CASSANDRA-12261)
 + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
 + * Retry all internode messages once after a connection is
 +   closed and reopened (CASSANDRA-12192)
 + * Add 

[2/6] cassandra git commit: Pass root cause to CorruptBlockException when uncompression failed

[yukim]

Pass root cause to CorruptBlockException when uncompression failed

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12889


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

Branch: refs/heads/cassandra-3.X
Commit: c39a9b08d94ebcb22e6f4e400fc79f169564b3ce
Parents: 9d90b4e
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Nov 9 11:43:10 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Nov 10 09:30:09 2016 -0600

--
 CHANGES.txt  | 1 +
 .../cassandra/io/compress/CompressedRandomAccessReader.java  | 4 ++--
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f0e201..9598546 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
  * Fix partition count log during compaction (CASSANDRA-12184)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index 329d932..0624e89 100644
--- 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -122,7 +122,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {
@@ -184,7 +184,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9bd1145..74258cf 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -203,7 +203,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize);
+throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize, e);
 }
 
 CRC32 checksum = new CRC32();

[6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/bd2970f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2970f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2970f1

Branch: refs/heads/trunk
Commit: bd2970f19f52f495fe39bd3e3002aa4f58891f70
Parents: d568313 0dc8440
Author: Yuki Morishita 
Authored: Thu Nov 10 09:34:46 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Nov 10 09:34:46 2016 -0600

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 src/java/org/apache/cassandra/io/util/CompressedChunkReader.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2970f1/CHANGES.txt
--
diff --cc CHANGES.txt
index 69a05c2,e765a9c..9678ca1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -107,8 -99,9 +107,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
   * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
   * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
   * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)

[1/6] cassandra git commit: Pass root cause to CorruptBlockException when uncompression failed

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 9d90b4e2d -> c39a9b08d
  refs/heads/cassandra-3.X a07d7ac48 -> 0dc8440ef
  refs/heads/trunk d56831346 -> bd2970f19


Pass root cause to CorruptBlockException when uncompression failed

patch by yukim; reviewed by Paulo Motta for CASSANDRA-12889


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

Branch: refs/heads/cassandra-3.0
Commit: c39a9b08d94ebcb22e6f4e400fc79f169564b3ce
Parents: 9d90b4e
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Nov 9 11:43:10 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Nov 10 09:30:09 2016 -0600

--
 CHANGES.txt  | 1 +
 .../cassandra/io/compress/CompressedRandomAccessReader.java  | 4 ++--
 .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f0e201..9598546 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
  * Fix partition count log during compaction (CASSANDRA-12184)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index 329d932..0624e89 100644
--- 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -122,7 +122,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {
@@ -184,7 +184,7 @@ public class CompressedRandomAccessReader extends 
RandomAccessReader
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunk);
+throw new CorruptBlockException(getPath(), chunk, e);
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java 
b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9bd1145..74258cf 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -203,7 +203,7 @@ public class CompressedSequentialWriter extends 
SequentialWriter
 }
 catch (IOException e)
 {
-throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize);
+throw new CorruptBlockException(getPath(), chunkOffset, 
chunkSize, e);
 }
 
 CRC32 checksum = new CRC32();

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: bc78a2afac1bca4cd17ae3e156033ff0b205f3fc
Parents: d582d03 92594d8
Author: Yuki Morishita 
Authored: Tue Nov 8 09:42:54 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:42:54 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java   | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc78a2af/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 535217f,3cd8737..344fa58
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -23,8 -23,8 +23,6 @@@ import java.util.Map
  import java.util.UUID;
  
  import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.metrics.StorageMetrics;
--import org.apache.cassandra.service.StorageService;
  
  /** Implements serializable to allow structured info to be returned via JMX. 
*/
  public final class CompactionInfo implements Serializable

[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 92594d8b89746e91a302e53cf17f1e27891a8913
Parents: 78fdfe2 cbebb29
Author: Yuki Morishita 
Authored: Tue Nov 8 09:41:32 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:41:32 2016 -0600

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92594d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 1d2c8f3,9d328ae..d3043b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.2.9
 +3.0.10
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
   * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)

[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 92594d8b89746e91a302e53cf17f1e27891a8913
Parents: 78fdfe2 cbebb29
Author: Yuki Morishita 
Authored: Tue Nov 8 09:41:32 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:41:32 2016 -0600

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92594d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 1d2c8f3,9d328ae..d3043b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.2.9
 +3.0.10
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
   * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)

[03/10] cassandra git commit: Fix potential NPE for compactionstats

[yukim]

Fix potential NPE for compactionstats

patch by Simon Zhou; reviewed by yukim for CASSANDRA-12462


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

Branch: refs/heads/cassandra-3.X
Commit: cbebb29adf5d8b13e75fe60c2f7aa312420be35c
Parents: 312e21b
Author: Simon Zhou <sz...@uber.com>
Authored: Thu Sep 22 16:35:52 2016 -0700
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 8 09:31:15 2016 -0600

--
 CHANGES.txt| 3 +--
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33ef8d..9d328ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
  * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
  * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
@@ -9,8 +10,6 @@
  * Better handle invalid system roles table (CASSANDRA-12700)
  * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
-===
-2.1.17
  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index fe81eac..3cd8737 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -65,17 +65,17 @@ public final class CompactionInfo implements Serializable
 
 public UUID getId()
 {
-return cfm.cfId;
+return cfm != null ? cfm.cfId : null;
 }
 
 public String getKeyspace()
 {
-return cfm.ksName;
+return cfm != null ? cfm.ksName : null;
 }
 
 public String getColumnFamily()
 {
-return cfm.cfName;
+return cfm != null ? cfm.cfName : null;
 }
 
 public CFMetaData getCFMetaData()

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 92594d8b89746e91a302e53cf17f1e27891a8913
Parents: 78fdfe2 cbebb29
Author: Yuki Morishita 
Authored: Tue Nov 8 09:41:32 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:41:32 2016 -0600

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92594d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 1d2c8f3,9d328ae..d3043b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.2.9
 +3.0.10
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
   * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)

[04/10] cassandra git commit: Fix potential NPE for compactionstats

[yukim]

Fix potential NPE for compactionstats

patch by Simon Zhou; reviewed by yukim for CASSANDRA-12462


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

Branch: refs/heads/trunk
Commit: cbebb29adf5d8b13e75fe60c2f7aa312420be35c
Parents: 312e21b
Author: Simon Zhou <sz...@uber.com>
Authored: Thu Sep 22 16:35:52 2016 -0700
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 8 09:31:15 2016 -0600

--
 CHANGES.txt| 3 +--
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33ef8d..9d328ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
  * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
  * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
@@ -9,8 +10,6 @@
  * Better handle invalid system roles table (CASSANDRA-12700)
  * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
-===
-2.1.17
  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index fe81eac..3cd8737 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -65,17 +65,17 @@ public final class CompactionInfo implements Serializable
 
 public UUID getId()
 {
-return cfm.cfId;
+return cfm != null ? cfm.cfId : null;
 }
 
 public String getKeyspace()
 {
-return cfm.ksName;
+return cfm != null ? cfm.ksName : null;
 }
 
 public String getColumnFamily()
 {
-return cfm.cfName;
+return cfm != null ? cfm.cfName : null;
 }
 
 public CFMetaData getCFMetaData()

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: bc78a2afac1bca4cd17ae3e156033ff0b205f3fc
Parents: d582d03 92594d8
Author: Yuki Morishita 
Authored: Tue Nov 8 09:42:54 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:42:54 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java   | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc78a2af/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 535217f,3cd8737..344fa58
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -23,8 -23,8 +23,6 @@@ import java.util.Map
  import java.util.UUID;
  
  import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.metrics.StorageMetrics;
--import org.apache.cassandra.service.StorageService;
  
  /** Implements serializable to allow structured info to be returned via JMX. 
*/
  public final class CompactionInfo implements Serializable

[02/10] cassandra git commit: Fix potential NPE for compactionstats

[yukim]

Fix potential NPE for compactionstats

patch by Simon Zhou; reviewed by yukim for CASSANDRA-12462


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

Branch: refs/heads/cassandra-3.0
Commit: cbebb29adf5d8b13e75fe60c2f7aa312420be35c
Parents: 312e21b
Author: Simon Zhou <sz...@uber.com>
Authored: Thu Sep 22 16:35:52 2016 -0700
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 8 09:31:15 2016 -0600

--
 CHANGES.txt| 3 +--
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33ef8d..9d328ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
  * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
  * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
@@ -9,8 +10,6 @@
  * Better handle invalid system roles table (CASSANDRA-12700)
  * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
-===
-2.1.17
  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index fe81eac..3cd8737 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -65,17 +65,17 @@ public final class CompactionInfo implements Serializable
 
 public UUID getId()
 {
-return cfm.cfId;
+return cfm != null ? cfm.cfId : null;
 }
 
 public String getKeyspace()
 {
-return cfm.ksName;
+return cfm != null ? cfm.ksName : null;
 }
 
 public String getColumnFamily()
 {
-return cfm.cfName;
+return cfm != null ? cfm.cfName : null;
 }
 
 public CFMetaData getCFMetaData()

[10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[yukim]

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/b6cb2ab6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6cb2ab6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6cb2ab6

Branch: refs/heads/trunk
Commit: b6cb2ab6b4f579c69835bd519343e59401a4dd74
Parents: 138f7b5 bc78a2a
Author: Yuki Morishita 
Authored: Tue Nov 8 09:43:00 2016 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 8 09:43:00 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionInfo.java   | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


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

[01/10] cassandra git commit: Fix potential NPE for compactionstats

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 312e21bda -> cbebb29ad
  refs/heads/cassandra-3.0 78fdfe233 -> 92594d8b8
  refs/heads/cassandra-3.X d582d0340 -> bc78a2afa
  refs/heads/trunk 138f7b5d0 -> b6cb2ab6b


Fix potential NPE for compactionstats

patch by Simon Zhou; reviewed by yukim for CASSANDRA-12462


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

Branch: refs/heads/cassandra-2.2
Commit: cbebb29adf5d8b13e75fe60c2f7aa312420be35c
Parents: 312e21b
Author: Simon Zhou <sz...@uber.com>
Authored: Thu Sep 22 16:35:52 2016 -0700
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Nov 8 09:31:15 2016 -0600

--
 CHANGES.txt| 3 +--
 .../org/apache/cassandra/db/compaction/CompactionInfo.java | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33ef8d..9d328ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
  * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
  * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
@@ -9,8 +10,6 @@
  * Better handle invalid system roles table (CASSANDRA-12700)
  * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
-===
-2.1.17
  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbebb29a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index fe81eac..3cd8737 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -65,17 +65,17 @@ public final class CompactionInfo implements Serializable
 
 public UUID getId()
 {
-return cfm.cfId;
+return cfm != null ? cfm.cfId : null;
 }
 
 public String getKeyspace()
 {
-return cfm.ksName;
+return cfm != null ? cfm.ksName : null;
 }
 
 public String getColumnFamily()
 {
-return cfm.cfName;
+return cfm != null ? cfm.cfName : null;
 }
 
 public CFMetaData getCFMetaData()