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

[mshuler]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.11
Commit: 13e153b090cdebd549d0d1a224c231e9fc1abbe1
Parents: f49579d fdb8c96
Author: Michael Shuler 
Authored: Thu Jun 15 14:06:17 2017 -0500
Committer: Michael Shuler 
Committed: Thu Jun 15 14:06:17 2017 -0500

--
 build.properties.default | 2 +-
 build.xml| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


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


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

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

[snazy]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.11
Commit: f0f9cf232bf51107c855062c8b5b0196d0e90246
Parents: 2593809 eb0f443
Author: Robert Stupp 
Authored: Thu Feb 9 20:37:32 2017 +0100
Committer: Robert Stupp 
Committed: Thu Feb 9 20:37:32 2017 +0100

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 lib/licenses/netty-all-4.0.23.Final.txt | 202 ---
 lib/licenses/netty-all-4.0.44.Final.txt | 202 +++
 lib/netty-all-4.0.23.Final.jar  | Bin 1779991 -> 0 bytes
 lib/netty-all-4.0.44.Final.jar  | Bin 0 -> 2342652 bytes
 .../org/apache/cassandra/transport/Message.java |  12 +-
 7 files changed, 212 insertions(+), 207 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/CHANGES.txt
--
diff --cc CHANGES.txt
index 086e0e5,0c7d129..c8419ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,5 +1,34 @@@
 -2.1.17
 +2.2.9
 + * Fix speculative retry bugs (CASSANDRA-13009)
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
 + * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
 + * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
 + * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
 + * 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)
 + * 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)
 + * Fix Util.spinAssertEquals (CASSANDRA-12283)
 + * 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)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
 + * Split consistent range movement flag correction (CASSANDRA-12786)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 +Merged from 2.1:
+  * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
   * Fix paging for DISTINCT queries on partition keys and static columns 
(CASSANDRA-13017)
   * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
   * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/build.xml
--
diff --cc build.xml
index d9f8198,91dc34b..94e4723
--- a/build.xml
+++ b/build.xml
@@@ -402,26 -400,16 +402,26 @@@
  


 -  
 -  
 +  
 +  
 +  


-   
+   


 -  
 +  
 +  
 +  

  
 +  
 +  
 +  
 +  
 +  
  
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/src/java/org/apache/cassandra/transport/Message.java
--

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

[tylerhobbs]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 738a57992cd725feda3aad8f9dcfb40a0e82823d
Parents: 6dc595d cdd535f
Author: Tyler Hobbs 
Authored: Tue Sep 27 11:52:31 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 27 11:52:31 2016 -0500

--

--

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

[blerer]

Merge branch cassandra-2.1 into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 9583b6b312866a4861df1a795329695b3fc09328
Parents: 88b3cfc 527d189
Author: Benjamin Lerer 
Authored: Tue Aug 16 15:25:42 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Aug 16 15:26:26 2016 +0200

--
 CHANGES.txt |   1 +
 NEWS.txt|  10 +
 .../AbstractPrimaryKeyRestrictions.java |   5 +-
 .../cql3/restrictions/AbstractRestriction.java  |  10 +-
 .../ForwardingPrimaryKeyRestrictions.java   |  31 +-
 .../restrictions/MultiColumnRestriction.java|  48 +-
 .../restrictions/PrimaryKeyRestrictionSet.java  |  36 +-
 .../restrictions/PrimaryKeyRestrictions.java|   9 +-
 .../cql3/restrictions/Restriction.java  |  16 +-
 .../ReversedPrimaryKeyRestrictions.java |   9 +-
 .../restrictions/SingleColumnRestriction.java   |  57 +-
 .../restrictions/StatementRestrictions.java |  23 +-
 .../cql3/restrictions/TokenFilter.java  |  36 +-
 .../cql3/restrictions/TokenRestriction.java |  13 +-
 .../cql3/statements/ModificationStatement.java  |   4 +-
 .../cql3/statements/SelectStatement.java|  11 +-
 .../cql3/statements/UpdateStatement.java|   2 +-
 .../cassandra/db/compaction/Scrubber.java   | 159 +++-
 .../cassandra/db/marshal/ReversedType.java  |  10 -
 .../PrimaryKeyRestrictionSetTest.java   | 372 -
 .../validation/entities/SecondaryIndexTest.java | 142 
 .../cql3/validation/operations/DeleteTest.java  |  42 +
 .../operations/SelectOrderByTest.java   | 758 +++
 .../cql3/validation/operations/SelectTest.java  | 372 -
 .../cassandra/db/marshal/ReversedTypeTest.java  |   4 +-
 25 files changed, 1540 insertions(+), 640 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/CHANGES.txt
--
diff --cc CHANGES.txt
index 394598a,dee669a..c421398
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.1.16
 - * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
 +2.2.8
 + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
 + * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
 + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
 + * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Add byteman support for testing (CASSANDRA-12377)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Restore JVM metric export for metric reporters (CASSANDRA-12312)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Revert CASSANDRA-11427 (CASSANDRA-12351)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 + * Synchronize ThriftServer::stop() (CASSANDRA-12105)
 + * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 + * Don't write shadowed range tombstone (CASSANDRA-12030)
 +Merged from 2.1:
++ * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/NEWS.txt
--
diff --cc NEWS.txt
index f0712eb,6a70adc..0a3ab36
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,13 -13,18 +13,23 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -2.1.16
 -==
++2.2.8
++=
+ 
+ Upgrading
+ 

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

[slebresne]

Merge branch 'cassandra-2.1' into cassandra-2.2

* cassandra-2.1:
  Avoid clock skew corrupting other nodes through paxos


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

Branch: refs/heads/trunk
Commit: b3dd05e216a8631b12341a9fe138510be87308a1
Parents: 9e85e85 720870b
Author: Sylvain Lebresne 
Authored: Thu Jun 23 09:55:56 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 23 09:55:56 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/ClientState.java   | 56 +---
 .../apache/cassandra/service/StorageProxy.java  |  6 ++-
 .../org/apache/cassandra/utils/UUIDGen.java | 33 
 4 files changed, 88 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3dd05e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 36009c5,7474045..5106fad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 +2.2.7
 + * Validate bloom_filter_fp_chance against lowest supported
 +   value when the table is created (CASSANDRA-11920)
 + * RandomAccessReader: call isEOF() only when rebuffering, not for every read 
operation (CASSANDRA-12013)
 + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
  2.1.15
+  * Fix clock skew corrupting other nodes with paxos (CASSANDRA-11991)
   * Remove distinction between non-existing static columns and existing but 
null in LWTs (CASSANDRA-9842)
   * Support mlockall on IBM POWER arch (CASSANDRA-11576)
   * Cache local ranges when calculating repair neighbors (CASSANDRA-11933)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3dd05e2/src/java/org/apache/cassandra/service/ClientState.java
--
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index a15fa5c,f2e3f1c..1218928
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -112,10 -96,12 +112,12 @@@ public class ClientStat
  public final boolean isInternal;
  
  // The remote address of the client - null for internal clients.
 -private final SocketAddress remoteAddress;
 +private final InetSocketAddress remoteAddress;
  
- // The biggest timestamp that was returned by getTimestamp/assigned to a 
query. This is global to the VM
- // for the sake of paxos (see #9649).
+ // The biggest timestamp that was returned by getTimestamp/assigned to a 
query. This is global to ensure that the
+ // timestamp assigned are strictly monotonic on a node, which is 

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

[jmckenzie]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 0d8e7b18e54a378deae93f361ecd8ed593e0729b
Parents: dbefa85 a56bc16
Author: Josh McKenzie 
Authored: Fri Jun 17 12:39:37 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Jun 17 12:39:37 2016 -0400

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/utils/CLibrary.java| 28 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e7b18/CHANGES.txt
--
diff --cc CHANGES.txt
index d9afaa3,64cfdaa..2c66ef9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
 -2.1.15
 +2.2.7
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
+  * Support mlockall on IBM POWER arch (CASSANDRA-11576)
   * Cache local ranges when calculating repair neighbors (CASSANDRA-11933)
   * Allow LWT operation on static column with only partition keys 
(CASSANDRA-10532)
   * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e7b18/src/java/org/apache/cassandra/utils/CLibrary.java
--

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

[snazy]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: c2566d1cf9e239063a530ec08e8e098feffe387b
Parents: 52a827b 2f74831
Author: Robert Stupp 
Authored: Wed Jun 15 11:44:57 2016 +0200
Committer: Robert Stupp 
Committed: Wed Jun 15 11:44:57 2016 +0200

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/repair/RepairRunnable.java   |  9 +++--
 .../cassandra/service/ActiveRepairService.java|  5 +++--
 .../service/ActiveRepairServiceTest.java  | 18 ++
 4 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2566d1c/CHANGES.txt
--
diff --cc CHANGES.txt
index d0ca37f,ec2b48e..d9afaa3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
 -2.1.15
 +2.2.7
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
+  * Cache local ranges when calculating repair neighbors (CASSANDRA-11933)
   * Allow LWT operation on static column with only partition keys 
(CASSANDRA-10532)
   * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
   * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2566d1c/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairRunnable.java
index b849cf8,000..f92310b
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@@ -1,409 -1,0 +1,414 @@@
 +/*
 + * 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.repair;
 

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 05f8a008f696d9624ec85176fa0e2a1ce06a1ad5
Parents: 593bbf5 72acbcd
Author: Marcus Eriksson 
Authored: Mon Jun 13 14:34:01 2016 +0200
Committer: Marcus Eriksson 
Committed: Mon Jun 13 15:00:08 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  4 ++
 .../org/apache/cassandra/db/lifecycle/View.java |  5 ++
 .../cassandra/streaming/StreamSession.java  | 22 +++
 .../io/sstable/SSTableRewriterTest.java | 66 
 5 files changed, 86 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05f8a008/CHANGES.txt
--
diff --cc CHANGES.txt
index d639d43,ebcc90c..491f72a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,7 +1,32 @@@
 -2.1.15
 +2.2.7
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
+  * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
   * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
 - * Updated cqlsh Python driver to fix DESCRIBE problem for legacy tables 
(CASSANDRA-11055)
   * cqlsh: apply current keyspace to source command (CASSANDRA-11152)
   * Backport CASSANDRA-11578 (CASSANDRA-11750)
   * Clear out parent repair session if repair coordinator dies 
(CASSANDRA-11824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05f8a008/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index e24917c,559ba0b..d3a5028
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1588,8 -1529,12 +1588,12 @@@ public class DatabaseDescripto
  
  public static int getSSTablePreempiveOpenIntervalInMB()
  {
 -return conf.sstable_preemptive_open_interval_in_mb;
 +return FBUtilities.isWindows() ? -1 : 
conf.sstable_preemptive_open_interval_in_mb;
  }
+ public static void setSSTablePreempiveOpenIntervalInMB(int mb)
+ {
+ conf.sstable_preemptive_open_interval_in_mb = mb;
+ }
  
  public static boolean getTrickleFsync()
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05f8a008/src/java/org/apache/cassandra/db/lifecycle/View.java
--
diff --cc 

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 593bbf57dd2e87df031d13edb2fad8234610521e
Parents: 1dffa02 68319f7
Author: Stefania Alborghetti 
Authored: Fri Jun 10 15:51:11 2016 -0500
Committer: Stefania Alborghetti 
Committed: Fri Jun 10 15:52:44 2016 -0500

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 38 +++---
 2 files changed, 36 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/593bbf57/CHANGES.txt
--
diff --cc CHANGES.txt
index 7ec3ae9,af641e1..d639d43
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,6 +1,31 @@@
 -2.1.15
 +2.2.7
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
+  * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
 - * Updated cqlsh Python driver to fix DESCRIBE problem for legacy tables 
(CASSANDRA-11055)
   * cqlsh: apply current keyspace to source command (CASSANDRA-11152)
   * Backport CASSANDRA-11578 (CASSANDRA-11750)
   * Clear out parent repair session if repair coordinator dies 
(CASSANDRA-11824)

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

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 38e973d08f8b51fb8b47179318b7e4b9754d34f9
Parents: c8d9555 86c5a00
Author: Stefania Alborghetti 
Authored: Fri Apr 29 08:17:21 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 29 08:17:21 2016 +0800

--
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38e973d0/debian/rules
--

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: b6b2517700b058900ec15b0c61717f82308c9138
Parents: 2dbcb5d 72057c6
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:06:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:07:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/CHANGES.txt
--
diff --cc CHANGES.txt
index b3dea85,5885a9a..bdabf29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index e927ccc,d68812c..a7a6671
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1657,7 -1633,8 +1657,8 @@@ class ImportConversion(object)
  self.decimal_sep = parent.decimal_sep
  self.thousands_sep = parent.thousands_sep
  self.boolean_styles = parent.boolean_styles
 -self.time_format = parent.time_format
 +self.date_time_format = parent.date_time_format.timestamp_format
+ self.debug = parent.debug
  
  self.table_meta = table_meta
  self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@@ -1706,10 -1683,23 +1707,19 @@@
  return CqlRuleSet.dequote_value(v)
  
  def convert(t, v):
- return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+ v = unprotect(v)
+ if v == self.nullval:
+ return self.get_null_val()
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
+ 
+ def convert_mandatory(t, v):
+ v = unprotect(v)
+ if v == self.nullval:
+ raise ParseError('Empty values are not allowed')
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
  
  def convert_blob(v, **_):
 -try:
 -return bytearray.fromhex(v[2:])
 -except TypeError:
 -# Work-around for Python 2.6 bug
 -return bytearray.fromhex(unicode(v[2:]))
 +return bytearray.fromhex(v[2:])
  
  def convert_text(v, **_):
  return v
@@@ -1897,10 -1890,15 +1910,15 @@@
  if row[i] == self.nullval:
  raise ParseError(self.get_null_primary_key_message(i))
  
- try:
- return [conv(val) if val != self.nullval else None for conv, val 
in zip(converters, row)]
- except Exception, e:
- raise ParseError(e.message)
+ def convert(c, v):
+ try:
+ return c(v) if v != self.nullval else self.get_null_val()
+ except Exception, e:
+ if self.debug:
+ traceback.print_exc()
 -raise ParseError("Failed to parse %s : %s" % (val, str(e)))
++raise ParseError("Failed to parse %s : %s" % (val, e.message))
+ 
+ return [convert(conv, val) for conv, val in zip(converters, row)]
  
  def get_null_primary_key_message(self, idx):
  message = "Cannot insert null value for primary key column '%s'." % 
(self.columns[idx],)

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 2dbcb5dae15ac0c2dc0a35b83e820f6a9147b9fb
Parents: cfc398e b25139f
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:44:04 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:44:04 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dbcb5da/CHANGES.txt
--
diff --cc CHANGES.txt
index d73ed01,ff26fde..b3dea85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 3128802a5f9d83a2f98794edd7f94890dd070a90
Parents: 1d7c0bc cc75de6
Author: Marcus Eriksson 
Authored: Tue Apr 26 08:25:45 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 26 08:25:45 2016 +0200

--
 CHANGES.txt |  1 +
 .../compaction/LeveledCompactionStrategy.java   | 15 -
 .../db/compaction/LeveledManifest.java  | 15 -
 .../LongLeveledCompactionStrategyTest.java  | 60 
 4 files changed, 87 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3128802a/CHANGES.txt
--
diff --cc CHANGES.txt
index 1837a6e,d170def..06b27b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,61 -3,18 +8,62 @@@ Merged from 2.1
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
 + * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 +   processes (CASSANDRA-11505)
+  * Validate levels when building LeveledScanner to avoid overlaps with 
orphaned sstables (CASSANDRA-9935)
  
  
 -2.1.14
 - * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 -   processes (CASSANDRA-11505)
 - * Replace sstables on DataTracker before marking them as non-compacting 
during anti-compaction (CASSANDRA-11548)
 +2.2.6
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 + * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
 + * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
 + * Add cassandra-stress keystore option (CASSANDRA-9325)
 + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
 + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
 + * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
 + * cqlsh: COPY FROM should check that explicit column names are valid 
(CASSANDRA-11333)
 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
 + * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
 + * Fix bloom filter sizing with LCS (CASSANDRA-11344)
 + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 + * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 + * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
 + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 + * Fix filtering on non-primary key columns for thrift static column families
 +   (CASSANDRA-6377)
 + * Only log yaml config once, at startup (CASSANDRA-11217)
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist 

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 1d7c0bc210532743946ce1929c2ed11551ea4246
Parents: 5f99629 c43cf8d
Author: Yuki Morishita 
Authored: Mon Apr 25 20:05:06 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Apr 25 20:05:06 2016 -0500

--
 CHANGES.txt  | 1 +
 bin/debug-cql| 8 
 bin/nodetool | 9 +
 bin/sstablekeys  | 9 +
 bin/sstableloader| 9 +
 bin/sstablescrub | 9 +
 bin/sstableupgrade   | 9 +
 tools/bin/cassandra-stress   | 9 +
 tools/bin/cassandra-stressd  | 9 +
 tools/bin/json2sstable   | 9 +
 tools/bin/sstable2json   | 9 +
 tools/bin/sstableexpiredblockers | 9 +
 tools/bin/sstablelevelreset  | 9 +
 tools/bin/sstablemetadata| 9 +
 tools/bin/sstableofflinerelevel  | 9 +
 tools/bin/sstablerepairedset | 9 +
 tools/bin/sstablesplit   | 9 +
 17 files changed, 80 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7c0bc2/CHANGES.txt
--
diff --cc CHANGES.txt
index affb723,4f6a4db..1837a6e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -2.1.15
 +2.2.7
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)

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

[snazy]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 5f99629a37185e5fdc23e0a71f04a709f5e4a303
Parents: 7713c82 07c9fa2
Author: Robert Stupp 
Authored: Mon Apr 25 10:18:16 2016 +0200
Committer: Robert Stupp 
Committed: Mon Apr 25 10:18:16 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f99629a/CHANGES.txt
--
diff --cc CHANGES.txt
index bd31b4b,53945d6..affb723
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,66 -1,17 +1,67 @@@
 -2.1.15
 +2.2.7
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
 -
 -2.1.14
   * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 processes (CASSANDRA-11505)
 - * Replace sstables on DataTracker before marking them as non-compacting 
during anti-compaction (CASSANDRA-11548)
 +
 +
 +2.2.6
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 + * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
 + * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
 + * Add cassandra-stress keystore option (CASSANDRA-9325)
 + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
 + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
 + * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
 + * cqlsh: COPY FROM should check that explicit column names are valid 
(CASSANDRA-11333)
 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
 + * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
 + * Fix bloom filter sizing with LCS (CASSANDRA-11344)
 + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 + * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 + * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
 + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 + * Fix filtering on non-primary key columns for thrift static column families
 +   (CASSANDRA-6377)
 + * Only log yaml config once, at startup (CASSANDRA-11217)
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled 

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 7713c821cab2bef0c6e2260f1e4c59ed5cde5237
Parents: c42f5f6 666bee6
Author: Stefania Alborghetti 
Authored: Fri Apr 22 09:42:57 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 22 09:42:57 2016 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7713c821/CHANGES.txt
--
diff --cc CHANGES.txt
index d16f6f6,2a93e9a..bd31b4b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,16 +1,66 @@@
 -2.1.15
 +2.2.7
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
 -
 -2.1.14
   * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 processes (CASSANDRA-11505)
 - * Replace sstables on DataTracker before marking them as non-compacting 
during anti-compaction (CASSANDRA-11548)
 +
 +
 +2.2.6
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 + * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
 + * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
 + * Add cassandra-stress keystore option (CASSANDRA-9325)
 + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
 + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
 + * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
 + * cqlsh: COPY FROM should check that explicit column names are valid 
(CASSANDRA-11333)
 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
 + * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
 + * Fix bloom filter sizing with LCS (CASSANDRA-11344)
 + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 + * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 + * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
 + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 + * Fix filtering on non-primary key columns for thrift static column families
 +   (CASSANDRA-6377)
 + * Only log yaml config once, at startup (CASSANDRA-11217)
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix 

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

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: b80ff541e25d4123f772dd82f00094e7c3837698
Parents: eb072a0 c8914c0
Author: Stefania Alborghetti 
Authored: Thu Apr 21 10:12:24 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Apr 21 10:12:24 2016 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b80ff541/CHANGES.txt
--
diff --cc CHANGES.txt
index 6e6e17b,73780de..e51e6d2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,15 +1,64 @@@
 -2.1.15
 +2.2.7
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
 -
 -2.1.14
   * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 processes (CASSANDRA-11505)
 - * Replace sstables on DataTracker before marking them as non-compacting 
during anti-compaction (CASSANDRA-11548)
 +
 +
 +2.2.6
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 + * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
 + * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
 + * Add cassandra-stress keystore option (CASSANDRA-9325)
 + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
 + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
 + * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
 + * cqlsh: COPY FROM should check that explicit column names are valid 
(CASSANDRA-11333)
 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
 + * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
 + * Fix bloom filter sizing with LCS (CASSANDRA-11344)
 + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 + * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 + * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
 + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 + * Fix filtering on non-primary key columns for thrift static column families
 +   (CASSANDRA-6377)
 + * Only log yaml config once, at startup (CASSANDRA-11217)
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
 + 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: ab2b8a60c4b6d27081d632fefa0e19ee13816e2c
Parents: 3557d2e c1b1d3b
Author: Aleksey Yeschenko 
Authored: Mon Apr 11 19:14:41 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Apr 11 19:15:47 2016 +0100

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml |  3 ++
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 +++
 .../cql3/statements/BatchStatement.java | 42 +---
 5 files changed, 21 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab2b8a60/CHANGES.txt
--
diff --cc CHANGES.txt
index e935e57,6385509..419ed21
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,9 +1,52 @@@
 -2.1.14
 +2.2.6
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 + * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
 + * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
 + * Add cassandra-stress keystore option (CASSANDRA-9325)
 + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
 + * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 + * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
 + * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
 + * cqlsh: COPY FROM should check that explicit column names are valid 
(CASSANDRA-11333)
 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
 + * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
 + * Fix bloom filter sizing with LCS (CASSANDRA-11344)
 + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 + * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 + * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
 + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
 + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
 + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 + * Fix filtering on non-primary key columns for thrift static column families
 +   (CASSANDRA-6377)
 + * Only log yaml config once, at startup (CASSANDRA-11217)
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * Checking if an unlogged batch is local is inefficient (CASSANDRA-11529)
   * Fix paging for COMPACT tables without clustering columns (CASSANDRA-11467)
 - * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448)
 - * Backport CASSANDRA-10859 (CASSANDRA-11415)
 - * COPY FROM fails when importing blob (CASSANDRA-11375)
 + * Add a -j parameter to scrub/cleanup/upgradesstables 

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

[jasobrown]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 77ff794737f067b04f1e2fae6124cb22921eb4c7
Parents: 5009594 7877d6f
Author: Jason Brown 
Authored: Tue Feb 23 14:31:38 2016 -0800
Committer: Jason Brown 
Committed: Tue Feb 23 14:35:03 2016 -0800

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java |  3 +-
 .../cassandra/gms/FailureDetectorTest.java  | 85 
 3 files changed, 87 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77ff7947/CHANGES.txt
--
diff --cc CHANGES.txt
index 01e7b3d,82ee99e..e989e7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -2.1.14
 +2.2.6
 + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
 + * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
 + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
 + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
 + * Protect from keyspace dropped during repair (CASSANDRA-11065)
 + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
 + * Better error message for cleanup (CASSANDRA-10991)
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
   * Add partition key to TombstoneOverwhelmingException error message 
(CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77ff7947/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 15b0bd6d0369ec8d461996c1249dd8921c75d036
Parents: 78f46de 757e314
Author: Yuki Morishita 
Authored: Wed Feb 17 10:26:48 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 17 10:26:48 2016 -0600

--
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 bin/cassandra.ps1 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/CHANGES.txt
--
diff --cc CHANGES.txt
index 2a3854b,c40c3ce..968c8b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.1.14
 +2.2.6
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
   * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/bin/cassandra
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/bin/cassandra.ps1
--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 78f46ded7fdac473c4cbb0391a13090e8eb51324
Parents: 97f3aa6 434dfc9
Author: Yuki Morishita 
Authored: Wed Feb 17 09:53:12 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 17 09:53:12 2016 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/BulkLoader.java | 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f46ded/CHANGES.txt
--
diff --cc CHANGES.txt
index 288f204,55f806c..2a3854b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.1.14
 +2.2.6
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
   * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)
   * Improve nodetool status performance for large cluster (CASSANDRA-7238)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f46ded/src/java/org/apache/cassandra/tools/BulkLoader.java
--

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 984e174dea689f510b24df6ec32581147e96613f
Parents: b59da28 393c6ec
Author: Marcus Eriksson 
Authored: Thu Feb 11 08:57:13 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 08:57:13 2016 +0100

--
 .../db/compaction/CompactionsCQLTest.java   | 48 ++--
 1 file changed, 24 insertions(+), 24 deletions(-)
--

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: b59da28c0d7ab97c7014f8c4553e55054ae851ad
Parents: 7d7ff7f 3ea34aa
Author: Marcus Eriksson 
Authored: Thu Feb 11 08:39:31 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 08:39:31 2016 +0100

--
 .../LeveledCompactionStrategyTest.java  | 25 +---
 1 file changed, 22 insertions(+), 3 deletions(-)
--


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

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 7d7ff7f3cd317531a096e9f06c0bac9f5e139496
Parents: d719506 9654994
Author: Marcus Eriksson 
Authored: Thu Feb 11 08:25:14 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 08:25:14 2016 +0100

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  12 +++-
 .../cassandra/db/compaction/Scrubber.java   |  19 ++-
 .../cassandra/tools/StandaloneScrubber.java |   2 +-
 .../Keyspace1-Standard3-jb-1-Summary.db | Bin 63 -> 75 bytes
 .../unit/org/apache/cassandra/db/ScrubTest.java |  14 +++---
 6 files changed, 22 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d7ff7f3/CHANGES.txt
--
diff --cc CHANGES.txt
index 318672f,9f51291..7565386
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,9 +1,12 @@@
 -2.1.14
 +2.2.6
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)
 +Merged from 2.1:
+  * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)
   * Improve nodetool status performance for large cluster (CASSANDRA-7238)
 - * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
   * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
 + * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
   * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d7ff7f3/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index c51ed7d,55b873a..8ca9852
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -327,15 -340,9 +327,9 @@@ public class CompactionManager implemen
  }
  }
  
 -public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData) throws InterruptedException, 
ExecutionException
 +public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData)
 +throws InterruptedException, ExecutionException
  {
- return performScrub(cfs, skipCorrupted, checkData, false);
- }
- 
- public AllSSTableOpStatus performScrub(final ColumnFamilyStore cfs, final 
boolean skipCorrupted, final boolean checkData, final boolean offline)
- throws InterruptedException, ExecutionException
- {
 -assert !cfs.isIndex();
  return parallelAllSSTableOperation(cfs, new OneSSTableOperation()
  {
  @Override
@@@ -345,30 -352,11 +339,30 @@@
  }
  
  @Override
 -public void execute(SSTableReader input) throws IOException
 +public void execute(LifecycleTransaction input) throws IOException
  {
- scrubOne(cfs, input, skipCorrupted, checkData, offline);
+ scrubOne(cfs, input, skipCorrupted, checkData);
  }
 -});
 +}, OperationType.SCRUB);
 +}
 +
 +public AllSSTableOpStatus performVerify(final ColumnFamilyStore cfs, 
final boolean extendedVerify) throws InterruptedException, ExecutionException
 +{
 +assert !cfs.isIndex();
 +return parallelAllSSTableOperation(cfs, new OneSSTableOperation()
 +{
 +@Override
 +public Iterable 
filterSSTables(LifecycleTransaction input)
 +{
 +return input.originals();
 +}
 +
 +@Override
 +public void execute(LifecycleTransaction input) throws IOException
 +{
 +verifyOne(cfs, input.onlyOne(), extendedVerify);
 +}
 +}, OperationType.VERIFY);
  }
  
  public AllSSTableOpStatus performSSTableRewrite(final ColumnFamilyStore 
cfs, final boolean excludeCurrentVersion) throws InterruptedException, 
ExecutionException
@@@ -705,14 -683,14 +699,14 @@@
  }
  }
  
- private void 

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

[marcuse]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 6982aaad85451711a8257a0046b6fc6f17db0b7c
Parents: 6622970 dd23adf
Author: Marcus Eriksson 
Authored: Mon Feb 8 08:55:10 2016 +0100
Committer: Marcus Eriksson 
Committed: Mon Feb 8 08:55:10 2016 +0100

--
 CHANGES.txt   |  4 
 .../db/compaction/DateTieredCompactionStrategy.java   | 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6982aaad/CHANGES.txt
--
diff --cc CHANGES.txt
index 0d98779,054ad1d..12198e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,39 @@@
 -2.1.13
 +2.2.6
 + * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)
++Merged from 2.1:
+  * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
++
++
 +2.2.5
 + * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
 + * Apply change to compaction throughput in real time (CASSANDRA-10025)
 + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
 + * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
 + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
 +   going (CASSANDRA-10979)
 + * Make UUID LSB unique per process (CASSANDRA-7925)
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * (cqlsh) encode input correctly when saving history
 +Merged from 2.1:
   * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * Fix isJoined return true only after becoming cluster member 
(CASANDRA-11007)
   * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6982aaad/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index e2d884f,64a599d..8c59e1a
--- 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@@ -386,14 -383,14 +386,16 @@@ public class DateTieredCompactionStrate
  }
  
  @Override
 -public synchronized Collection getMaximalTask(int 
gcBefore)
 +@SuppressWarnings("resource")
 +public synchronized Collection getMaximalTask(int 
gcBefore, boolean splitOutput)
  {
- LifecycleTransaction modifier = 
cfs.markAllCompacting(OperationType.COMPACTION);
- if (modifier == null)
+ Iterable filteredSSTables = 
filterSuspectSSTables(sstables);
+ if (Iterables.isEmpty(filteredSSTables))
  return null;
- 
- return Collections.singleton(new 
CompactionTask(cfs, modifier, gcBefore, false));
 -if 
(!cfs.getDataTracker().markCompacting(ImmutableList.copyOf(filteredSSTables)))
++LifecycleTransaction txn = 
cfs.getTracker().tryModify(filteredSSTables, OperationType.COMPACTION);
++if (txn == null)
+ 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 029b22e84d13f714b9a999fe7d6a1e6f8a5cfc0a
Parents: d295c7c 6fe70c6
Author: Aleksey Yeschenko 
Authored: Mon Feb 8 15:52:07 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 8 15:52:07 2016 +

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/029b22e8/CHANGES.txt
--
diff --cc CHANGES.txt
index b0a5062,806e6d5..770c394
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,9 +1,40 @@@
 -2.1.14
 +2.2.6
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
-  * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
 + * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)
 +Merged from 2.1:
+  * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
 + * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
  
  
 -2.1.13
 - * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
 +2.2.5
 + * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
 + * Apply change to compaction throughput in real time (CASSANDRA-10025)
 + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
 + * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
 + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
 +   going (CASSANDRA-10979)
 + * Make UUID LSB unique per process (CASSANDRA-7925)
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * (cqlsh) encode input correctly when saving history
 +Merged from 2.1:
   * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * Fix isJoined return true only after becoming cluster member 
(CASANDRA-11007)
   * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.3
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:09 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:09 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
--
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
 -2.1.13
 +2.2.5
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
 - * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
   * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
   * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
   * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

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

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 0967825dd8c01da42e989964130579d07fa9b3c2
Parents: f9ac657 a55fd76
Author: Yuki Morishita 
Authored: Thu Dec 31 12:42:20 2015 -0600
Committer: Yuki Morishita 
Committed: Thu Dec 31 12:42:20 2015 -0600

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/CHANGES.txt
--
diff --cc CHANGES.txt
index 23d6bae,0bd5485..b700102
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 -2.1.13
 +2.2.5
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
 - * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
   * cqlsh fails to decode utf-8 characters for text typed columns 
(CASSANDRA-10875)
   * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
--

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

[jmckenzie]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: ee36f14c1427db8e3b91b7eda6c0e6f48ecb4f24
Parents: ae8baa4 3ccffc9
Author: Joshua McKenzie 
Authored: Wed Dec 23 13:21:12 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Dec 23 13:21:12 2015 -0500

--
 pylib/cqlshlib/copyutil.py | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


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

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: ae8baa499cc628cae7bbfa24e679cfe9aa9b42e3
Parents: e654c1b 7c3966b
Author: Yuki Morishita 
Authored: Tue Dec 22 14:29:42 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Dec 22 14:29:42 2015 -0600

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/CHANGES.txt
--
diff --cc CHANGES.txt
index 1ff1a5c,82176c5..fb0b151
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.13
 +2.2.5
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

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

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

[slebresne]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: e654c1bf040ffe14e0da9a0c3246aaababe12178
Parents: ebbd516 e438831
Author: Sylvain Lebresne 
Authored: Tue Dec 22 11:53:40 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 22 11:53:40 2015 +0100

--
 doc/cql3/CQL.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e654c1bf/doc/cql3/CQL.textile
--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: a549bd085f5244b3271249ce881ac30dd3f27553
Parents: 82aa796 068614c
Author: Yuki Morishita 
Authored: Tue Nov 3 09:40:49 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 3 09:40:49 2015 -0600

--
 CHANGES.txt|  1 +
 .../apache/cassandra/streaming/StreamReader.java   | 17 ++---
 .../streaming/compress/CompressedStreamReader.java | 17 ++---
 3 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a549bd08/CHANGES.txt
--
diff --cc CHANGES.txt
index ac997f2,4c24b35..5c23acf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Do STCS in DTCS windows (CASSANDRA-10276)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a549bd08/src/java/org/apache/cassandra/streaming/StreamReader.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamReader.java
index 1a3980d,5389a80..1ccebb0
--- a/src/java/org/apache/cassandra/streaming/StreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReader.java
@@@ -94,12 -89,12 +94,12 @@@ public class StreamReade
  }
  ColumnFamilyStore cfs = 
Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
  
- SSTableWriter writer = createWriter(cfs, totalSize, repairedAt, 
format);
- 
  DataInputStream dis = new DataInputStream(new 
LZFInputStream(Channels.newInputStream(channel)));
  BytesReadTracker in = new BytesReadTracker(dis);
+ SSTableWriter writer = null;
  try
  {
 -writer = createWriter(cfs, totalSize, repairedAt);
++writer = createWriter(cfs, totalSize, repairedAt, format);
  while (in.getBytesRead() < totalSize)
  {
  writeRow(writer, in, cfs);
@@@ -108,9 -102,21 +108,20 @@@
  session.progress(desc, ProgressInfo.Direction.IN, 
in.getBytesRead(), totalSize);
  }
  return writer;
 -}
 -catch (Throwable e)
 +} catch (Throwable e)
  {
- writer.abort();
+ if (writer != null)
+ {
+ try
+ {
+ writer.abort();
+ }
+ catch (Throwable e2)
+ {
+ // add abort error to original and continue so we can 
drain unread stream
+ e.addSuppressed(e2);
+ }
+ }
  drain(dis, in.getBytesRead());
  if (e instanceof IOException)
  throw (IOException) e;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a549bd08/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
--
diff --cc 
src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
index 1936a94,0529496..facb906
--- 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
+++ 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
@@@ -75,17 -72,15 +75,17 @@@ public class CompressedStreamReader ext
  }
  ColumnFamilyStore cfs = 
Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
  
- SSTableWriter writer = createWriter(cfs, totalSize, repairedAt, 
format);
- 
 -CompressedInputStream cis = new 
CompressedInputStream(Channels.newInputStream(channel), compressionInfo, 
inputVersion.hasPostCompressionAdlerChecksums);
 +CompressedInputStream cis = new 
CompressedInputStream(Channels.newInputStream(channel), compressionInfo);
  BytesReadTracker in = new BytesReadTracker(new DataInputStream(cis));
+   

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
src/java/org/apache/cassandra/utils/btree/NodeBuilder.java


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

Branch: refs/heads/trunk
Commit: 82aa7969c1b77967ef2e6ab847cb5c11cc4c002c
Parents: 0fbf715 986a1a7
Author: Benedict Elliott Smith 
Authored: Mon Nov 2 18:57:37 2015 +
Committer: Benedict Elliott Smith 
Committed: Mon Nov 2 18:57:37 2015 +

--
 .../apache/cassandra/utils/btree/Builder.java   |  2 +-
 .../cassandra/utils/btree/NodeBuilder.java  | 11 +++
 .../cassandra/utils/memory/MemoryUtil.java  |  2 +-
 .../org/apache/cassandra/db/NativeCellTest.java | 31 +++-
 4 files changed, 38 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aa7969/src/java/org/apache/cassandra/utils/btree/Builder.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aa7969/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
--

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

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

[samt]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: ca8e9a97b64e53163de87c7c769d93ffd568fe59
Parents: b154622 7f1fec1
Author: Sam Tunnicliffe 
Authored: Thu Oct 29 10:50:01 2015 +
Committer: Sam Tunnicliffe 
Committed: Thu Oct 29 10:50:45 2015 +

--
 CHANGES.txt |   1 +
 .../cql3/statements/UpdateStatement.java|   1 +
 .../db/index/PerRowSecondaryIndex.java  |   5 +
 .../db/index/SecondaryIndexManager.java |   8 +
 .../cassandra/thrift/CassandraServer.java   |  11 ++
 .../db/index/PerRowSecondaryIndexTest.java  | 178 ++-
 6 files changed, 200 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca8e9a97/CHANGES.txt
--
diff --cc CHANGES.txt
index cc4a8bd,3d22b91..ac997f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Do STCS in DTCS windows (CASSANDRA-10276)
   * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca8e9a97/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index ad46a0f,bf9a059..91a059f
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@@ -136,13 -134,14 +136,14 @@@ public class UpdateStatement extends Mo
  SecondaryIndex failedIndex = indexManager.validate(key, cell);
  if (failedIndex != null)
  {
 -throw new InvalidRequestException(String.format("Can't 
index column value of size %d for index %s on %s.%s",
 -
cell.value().remaining(),
 -
failedIndex.getIndexName(),
 -
cfm.ksName,
 -
cfm.cfName));
 +throw invalidRequest(String.format("Can't index column 
value of size %d for index %s on %s.%s",
 +   
cell.value().remaining(),
 +   
failedIndex.getIndexName(),
 +   cfm.ksName,
 +   cfm.cfName));
  }
  }
+ indexManager.validateRowLevelIndexes(key, cf);
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca8e9a97/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca8e9a97/src/java/org/apache/cassandra/thrift/CassandraServer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca8e9a97/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 6e35d1a,a332342..47da36d
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@@ -23,6 -26,6 +26,9 @@@ import java.util.Collections
  import java.util.List;
  import java.util.Set;
  
++import org.apache.cassandra.service.EmbeddedCassandraService;
++import org.apache.cassandra.thrift.*;
++import org.apache.thrift.TException;
  import org.junit.Before;
  import org.junit.BeforeClass;
  import org.junit.Test;
@@@ -65,17 -77,27 

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 32f22a4e35cd38c5a539a0bff47e1fe3edd86e61
Parents: 013ce88 17082d4
Author: Yuki Morishita 
Authored: Mon Oct 26 12:19:13 2015 -0500
Committer: Yuki Morishita 
Committed: Mon Oct 26 12:19:13 2015 -0500

--
 .../db/compaction/CompactionManager.java| 50 +---
 .../cassandra/service/StorageService.java   |  3 ++
 2 files changed, 37 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f22a4e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ea20a1f,b85eb51..0c6e24f
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -20,22 -20,16 +20,8 @@@ package org.apache.cassandra.db.compact
  import java.io.File;
  import java.io.IOException;
  import java.lang.management.ManagementFactory;
--import java.util.ArrayList;
 -import java.util.Arrays;
--import java.util.Collection;
--import java.util.Collections;
--import java.util.HashSet;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Map;
--import java.util.Set;
- import java.util.UUID;
- import java.util.concurrent.BlockingQueue;
- import java.util.concurrent.Callable;
- import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Future;
- import java.util.concurrent.LinkedBlockingQueue;
- import java.util.concurrent.SynchronousQueue;
- import java.util.concurrent.TimeUnit;
++import java.util.*;
+ import java.util.concurrent.*;
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
  import javax.management.openmbean.OpenDataException;

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

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

[jmckenzie]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 013ce88512af839800597d1adc52689679a725a3
Parents: a5053fd 34b8d8f
Author: Joshua McKenzie 
Authored: Fri Oct 23 13:58:59 2015 -0400
Committer: Joshua McKenzie 
Committed: Fri Oct 23 13:58:59 2015 -0400

--
 pylib/cqlshlib/test/run_cqlsh.py |  2 +-
 pylib/cqlshlib/test/test_cqlsh_output.py | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/013ce885/pylib/cqlshlib/test/run_cqlsh.py
--

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

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

[samt]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: f10d2ed955bca4cf2b010e31e5cf14a604624d9a
Parents: ccb738f da8be1c
Author: Sam Tunnicliffe 
Authored: Wed Oct 21 09:31:24 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Oct 21 09:31:24 2015 +0100

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/index/SecondaryIndexManager.java | 11 +++
 src/java/org/apache/cassandra/service/StorageProxy.java  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10d2ed9/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f5e8a7,2a28a86..560472a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,10 +1,14 @@@
 -2.1.12
 +2.2.4
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
 - * Fix paging issues with partitions containing only static columns data
 -   (CASSANDRA-10381)
 + * Fix paging issues with partitions containing only static columns data 
(CASSANDRA-10381)
   * Fix conditions on static columns (CASSANDRA-10264)
   * AssertionError: attempted to delete non-existing file CommitLog 
(CASSANDRA-10377)
 - * Merge range tombstones during compaction (CASSANDRA-7953)
   * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10d2ed9/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10d2ed9/src/java/org/apache/cassandra/service/StorageProxy.java
--

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 7d17f66e72b4ff47c2004a4e02c7d461de7a5cb3
Parents: 35cf8a3 c3ba6c8
Author: Benedict Elliott Smith 
Authored: Tue Oct 13 09:33:45 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Tue Oct 13 09:33:45 2015 +0100

--
 src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d17f66e/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
--

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 352928467b4ee3e42d96455b5c2d040d9728b060
Parents: 3573faf f87e34e
Author: Benedict Elliott Smith 
Authored: Sat Oct 10 09:22:46 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Sat Oct 10 09:22:46 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/io/util/ByteBufferDataInput.java  |  8 +--
 .../io/util/ByteBufferDataInputTest.java| 67 
 3 files changed, 69 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35292846/CHANGES.txt
--
diff --cc CHANGES.txt
index d57cc07,20529e8..ea0a2db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -2.1.11
 +2.2.3
 + * cqlsh pg-style-strings broken (CASSANDRA-10484)
 + * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 +Merged from 2.1:
+  * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)
   * Update internal python driver used by cqlsh (CASSANDRA-10161)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35292846/src/java/org/apache/cassandra/io/util/ByteBufferDataInput.java
--
diff --cc src/java/org/apache/cassandra/io/util/ByteBufferDataInput.java
index 2f00687,000..bf926e9
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/util/ByteBufferDataInput.java
+++ b/src/java/org/apache/cassandra/io/util/ByteBufferDataInput.java
@@@ -1,177 -1,0 +1,171 @@@
 +/*
 + * 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.io.util;
 +
 +import java.io.*;
 +import java.nio.ByteBuffer;
 +
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +
 +public class ByteBufferDataInput extends AbstractDataInput implements 
FileDataInput, DataInput
 +{
 +private final ByteBuffer buffer;
 +private final String filename;
 +private final long segmentOffset;
 +private int position;
 +
 +public ByteBufferDataInput(ByteBuffer buffer, String filename, long 
segmentOffset, int position)
 +{
 +assert buffer != null;
 +this.buffer = buffer;
 +this.filename = filename;
 +this.segmentOffset = segmentOffset;
 +this.position = position;
 +}
 +
 +// Only use when we know the seek in within the mapped segment. Throws an
 +// IOException otherwise.
 +public void seek(long pos) throws IOException
 +{
 +long inSegmentPos = pos - segmentOffset;
- if (!contains(pos))
++if (inSegmentPos < 0 || inSegmentPos > buffer.capacity())
 +throw new IOException(String.format("Seek position %d is not 
within mmap segment (seg offs: %d, length: %d)", pos, segmentOffset, 
buffer.capacity()));
 +
 +position = (int) inSegmentPos;
 +}
 +
- public boolean contains(long pos)
- {
- long inSegmentPos = pos - segmentOffset;
- return inSegmentPos >= 0 && inSegmentPos < buffer.capacity();
- }
- 
 +public long getFilePointer()
 +{
 +return segmentOffset + position;
 +}
 +
 +public long getPosition()
 +{
 +return segmentOffset + position;
 +}
 +
 +public long getPositionLimit()
 +{
 +return segmentOffset + buffer.capacity();
 +}
 +
 +@Override
 +public boolean markSupported()
 +{
 +return false;
 +}
 +
 +public void reset(FileMark mark) throws IOException
 +{
 +assert mark instanceof 

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

[samt]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 4bdc7bd407d5a377cff4134b6fb90f457058fab4
Parents: be89dae 484e645
Author: Sam Tunnicliffe 
Authored: Thu Oct 8 10:02:12 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Oct 8 10:02:12 2015 +0100

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 11 +++
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bdc7bd4/CHANGES.txt
--
diff --cc CHANGES.txt
index 82ee94d,a9b11ae..d2510b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,8 +1,22 @@@
 -2.1.11
 - * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 +2.2.3
 + * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 +Merged from 2.1:
   * Update internal python driver used by cqlsh (CASSANDRA-10161)
  
 -2.1.10
 +2.2.2
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 + * Configurable page size in cqlsh (CASSANDRA-9855)
 + * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
++ * Mark nodes as dead even if they've already left (CASSANDRA-10205)
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes
 share an rpc_address (CASSANDRA-10052)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bdc7bd4/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

[jmckenzie]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: a323641ef3243d193b60b92d937a7ab178b34602
Parents: 13b4bb4 39ab9e0
Author: Joshua McKenzie 
Authored: Tue Sep 29 12:14:18 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 29 12:14:18 2015 -0400

--
 .../org/apache/cassandra/utils/JVMStabilityInspector.java   | 4 
 .../apache/cassandra/utils/JVMStabilityInspectorTest.java   | 9 +
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a323641e/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java
--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: fc675450e9569a1555faa43c126cd0e5d91862e0
Parents: a323641 4c6411f
Author: Yuki Morishita 
Authored: Tue Sep 29 12:00:24 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Sep 29 12:00:24 2015 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/CHANGES.txt
--
diff --cc CHANGES.txt
index f3a6d44,3364dcd..c36c6f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -2.1.10
 +2.2.2
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 + * Configurable page size in cqlsh (CASSANDRA-9855)
 + * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
   * Fix potential ClassCastException during paging (CASSANDRA-10352)
   * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
   * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--

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

[brandonwilliams]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: dcada8bafd50ea66da443a49c755e701be4528fc
Parents: 32457e7 d0c166f
Author: Brandon Williams 
Authored: Fri Sep 18 09:16:24 2015 -0500
Committer: Brandon Williams 
Committed: Fri Sep 18 09:16:24 2015 -0500

--

--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 426109c50bf7f264c1965dd77482c161cbec0242
Parents: 5b05b68 588dc06
Author: Yuki Morishita 
Authored: Wed Sep 16 08:39:29 2015 -0500
Committer: Yuki Morishita 
Committed: Wed Sep 16 08:39:29 2015 -0500

--
 CHANGES.txt  |  1 +
 .../org/apache/cassandra/utils/FBUtilities.java  | 16 ++--
 .../apache/cassandra/utils/FBUtilitiesTest.java  | 19 +++
 3 files changed, 34 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/426109c5/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b5fa78,2787739..7deebcf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -2.1.10
 +2.2.2
 + * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
   * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)
   * BATCH statement is broken in cqlsh (CASSANDRA-10272)
   * Added configurable warning threshold for GC duration (CASSANDRA-8907)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/426109c5/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java
index b41bdab,f866610..6ef64ef
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@@ -26,14 -28,19 +26,16 @@@ import java.net.*
  import java.nio.ByteBuffer;
  import java.security.MessageDigest;
  import java.security.NoSuchAlgorithmException;
- import java.text.NumberFormat;
  import java.util.*;
 -import java.util.concurrent.ExecutionException;
 -import java.util.concurrent.Future;
 -import java.util.concurrent.TimeUnit;
 -import java.util.concurrent.TimeoutException;
 +import java.util.concurrent.*;
 +import java.util.zip.Adler32;
  import java.util.zip.Checksum;
  
+ import javax.annotation.Nonnull;
+ import javax.annotation.Nullable;
+ 
  import com.google.common.base.Joiner;
  import com.google.common.collect.AbstractIterator;
 -import org.apache.cassandra.io.util.FileUtils;
  import org.apache.commons.lang3.StringUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;

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

[snazy]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: e63dacf793fedc8a9eed9c7fc635cde5f9fd68f3
Parents: 8b2dc1f e889ee4
Author: Robert Stupp 
Authored: Wed Sep 16 22:00:25 2015 +0200
Committer: Robert Stupp 
Committed: Wed Sep 16 22:00:25 2015 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cache/AutoSavingCache.java | 193 --
 .../org/apache/cassandra/cache/CacheKey.java|  14 +-
 .../apache/cassandra/cache/CounterCacheKey.java |  26 +-
 .../org/apache/cassandra/cache/KeyCacheKey.java |  19 +-
 .../org/apache/cassandra/cache/OHCProvider.java |  17 +-
 .../org/apache/cassandra/cache/RowCacheKey.java |  34 +--
 .../org/apache/cassandra/config/CFMetaData.java |   9 +
 .../cassandra/config/DatabaseDescriptor.java|  19 +-
 .../org/apache/cassandra/config/Schema.java |  56 +++-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  75 ++
 src/java/org/apache/cassandra/db/Keyspace.java  |   4 -
 .../org/apache/cassandra/db/RowIndexEntry.java  |   2 +-
 .../db/index/SecondaryIndexManager.java |  30 +--
 .../io/sstable/format/SSTableReader.java|  10 +-
 .../io/sstable/format/big/BigTableReader.java   |   2 +-
 .../apache/cassandra/service/CacheService.java  |  58 ++--
 .../cassandra/service/CassandraDaemon.java  |  41 ++-
 .../cassandra/service/StorageService.java   |  31 ++-
 .../org/apache/cassandra/utils/FBUtilities.java |  16 ++
 .../cassandra/cache/AutoSavingCacheTest.java|   5 +-
 .../cassandra/cache/CacheProviderTest.java  |  17 +-
 .../apache/cassandra/cql3/KeyCacheCqlTest.java  | 266 +++
 .../apache/cassandra/db/CounterCacheTest.java   |  70 -
 .../org/apache/cassandra/db/KeyCacheTest.java   |   2 +-
 .../org/apache/cassandra/db/RowCacheTest.java   |  41 ++-
 26 files changed, 760 insertions(+), 298 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63dacf7/CHANGES.txt
--
diff --cc CHANGES.txt
index 7deebcf,207f16a..96ec0fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -2.1.10
 +2.2.2
 + * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * Fix cache handling of 2i and base tables (CASSANDRA-10155)
   * Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
   * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)
   * BATCH statement is broken in cqlsh (CASSANDRA-10272)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63dacf7/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index f0f4e8a,3ebbc76..3ec9d4e
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -61,8 -65,16 +67,16 @@@ public class AutoSavingCache saveTask;
  protected final CacheService.CacheType cacheType;
  
 -private CacheSerializer cacheLoader;
 +private final CacheSerializer cacheLoader;
- private static final String CURRENT_VERSION = "c";
+ 
+ /*
+  * CASSANDRA-10155 required a format change to fix 2i indexes and caching.
+  * 2.2 is already at version "c" and 3.0 is at "d".
+  *
+  * Since cache versions match exactly and there is no partial fallback 
just add
+  * a minor version letter.
+  */
 -private static final String CURRENT_VERSION = "ba";
++private static final String CURRENT_VERSION = "ca";
  
  private static volatile IStreamFactory streamFactory = new 
IStreamFactory()
  {
@@@ -90,16 -102,9 +104,14 @@@
  this.cacheLoader = cacheloader;
  }
  
- public File getCacheDataPath(UUID cfId, String version)
 -public File getCachePath(String version)
++public File getCacheDataPath(String version)
  {
- Pair names = 

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

[brandonwilliams]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 3b126fd5aff1cda9b6b0d6d2968a8103fc09d905
Parents: cd4a1e6 7fba3d2
Author: Brandon Williams 
Authored: Tue Sep 15 16:10:47 2015 -0500
Committer: Brandon Williams 
Committed: Tue Sep 15 16:10:47 2015 -0500

--
 src/java/org/apache/cassandra/gms/FailureDetector.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b126fd5/src/java/org/apache/cassandra/gms/FailureDetector.java
--

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

[snazy]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 9791796096cc2f61444169721bbc0ca03d9509e5
Parents: 53d0449 ae51086
Author: Robert Stupp 
Authored: Sun Sep 13 11:34:31 2015 +0200
Committer: Robert Stupp 
Committed: Sun Sep 13 11:34:31 2015 +0200

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 2 +-
 pylib/cqlshlib/cqlhandling.py  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/CHANGES.txt
--
diff --cc CHANGES.txt
index ffae4d9,dff47fc..bd24781
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,7 +1,17 @@@
 -2.1.10
 +2.2.2
 + * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * BATCH statement is broken in cqlsh (CASSANDRA-10272)
   * Added configurable warning threshold for GC duration (CASSANDRA-8907)
 - * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066)
 + * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066)
   * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
   * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
 have completed, regardless of the occurence of exceptions (CASSANDRA-10274)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cql3handling.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cqlhandling.py
--

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 02e5478f05178cbc563605dcaa65de60066e046e
Parents: 3effec5 2267d79
Author: Yuki Morishita 
Authored: Tue Sep 1 16:58:13 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Sep 1 16:58:13 2015 -0500

--
 CHANGES.txt   |  1 +
 .../cassandra/streaming/messages/StreamMessage.java   | 14 ++
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/CHANGES.txt
--
diff --cc CHANGES.txt
index 102,681a40b..91ae36c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -2.1.10
 +2.2.2
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * Fix handling of streaming EOF (CASSANDRA-10206)
   * Only check KeyCache when it is enabled
   * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
   * (cqlsh) update list of CQL keywords (CASSANDRA-9232)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/src/java/org/apache/cassandra/streaming/messages/StreamMessage.java
--

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

[brandonwilliams]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 8c43b8c3feb507ce43254a620060467087c7f12b
Parents: 0d2f403 57d48a9
Author: Brandon Williams 
Authored: Mon Aug 31 16:42:08 2015 -0500
Committer: Brandon Williams 
Committed: Mon Aug 31 16:42:08 2015 -0500

--
 CHANGES.txt |  3 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  2 ++
 .../org/apache/cassandra/tools/NodeTool.java|  1 +
 .../tools/nodetool/GetTraceProbability.java | 33 
 4 files changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/CHANGES.txt
--
diff --cc CHANGES.txt
index 37244c9,d57eaf7..d9f8a50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,11 +1,32 @@@
 -2.1.10
 +2.2.2
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
   * Only check KeyCache when it is enabled
+  * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
+  * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
+  * Add nodetool gettraceprobability command (CASSANDRA-10234)
  
  
 -2.1.9
 +2.2.1
 + * Fix race during construction of commit log (CASSANDRA-10049)
 + * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
 + * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
 + * (cqlsh) add CLEAR command (CASSANDRA-10086)
 + * Support string literals as Role names for compatibility (CASSANDRA-10135)
 + * Allow count(*) and count(1) to be use as normal aggregation 
(CASSANDRA-10114)
 + * An NPE is thrown if the column name is unknown for an IN relation 
(CASSANDRA-10043)
 + * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
 + * Fix histogram overflow exception (CASSANDRA-9973)
 + * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add checksum to saved cache files (CASSANDRA-9265)
 + * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
 + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
 + * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
   * Avoid race condition during read repair (CASSANDRA-9460)
   * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
   * Avoid returning Permission.NONE when failing to query users table 
(CASSANDRA-10168)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 2b256bd,51b1c93..ebbef7d
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -930,9 -971,11 +930,11 @@@ public class NodeProbe implements AutoC
  return ssProxy.getStreamThroughputMbPerSec();
  }
  
+ public double getTraceProbability() {return 
ssProxy.getTraceProbability();}
+ 
  public int getExceptionCount()
  {
 -return ssProxy.getExceptionCount();
 +return (int)StorageMetrics.exceptions.getCount();
  }
  
  public Map getDroppedMessages()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/src/java/org/apache/cassandra/tools/NodeTool.java
--

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

[brandonwilliams]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: c2b6dd4503dc8f11a98fbb2c732b21179997f894
Parents: 8c43b8c 542bb1f
Author: Brandon Williams 
Authored: Mon Aug 31 17:10:38 2015 -0500
Committer: Brandon Williams 
Committed: Mon Aug 31 17:10:38 2015 -0500

--

--

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: a6d65404467117c5b69b982c3576afb7e583db55
Parents: dd19a7f 5bee617
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Aug 23 11:30:43 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Aug 23 11:30:43 2015 +0100

--
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java | 39 
 2 files changed, 41 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d65404/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
--

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
src/java/org/apache/cassandra/service/CassandraDaemon.java
test/unit/org/apache/cassandra/db/CommitLogTest.java


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

Branch: refs/heads/trunk
Commit: 0871533945b19bb5ccf96ab7a28233cadd537a59
Parents: 6fd41ab 3b7934f
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Aug 9 09:40:09 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Aug 9 09:40:09 2015 +0200

--
 .../cassandra/service/CassandraDaemon.java  |   8 +
 .../cassandra/utils/JVMStabilityInspector.java  |   9 +-
 .../org/apache/cassandra/db/CommitLogTest.java  | 159 ++-
 .../apache/cassandra/utils/KillerForTests.java  |  11 +-
 4 files changed, 182 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08715339/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 10aa4b2,d078203..2020201
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -37,11 -34,9 +37,13 @@@ import javax.management.remote.JMXConne
  import javax.management.remote.JMXServiceURL;
  import javax.management.remote.rmi.RMIConnectorServer;
  
 +import com.codahale.metrics.Meter;
 +import com.codahale.metrics.MetricRegistryListener;
 +import com.codahale.metrics.SharedMetricRegistries;
+ import com.google.common.annotations.VisibleForTesting;
+ import com.google.common.collect.Iterables;
  import com.google.common.util.concurrent.Uninterruptibles;
 +import org.apache.cassandra.metrics.DefaultNameFactory;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/08715339/test/unit/org/apache/cassandra/db/CommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java
index c53d371,1c3daab..536f0cb
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@@ -19,74 -19,42 +19,82 @@@
  
  package org.apache.cassandra.db;
  
 -import java.io.*;
 +import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
 +
 +import java.io.ByteArrayOutputStream;
 +import java.io.DataOutputStream;
 +import java.io.File;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStream;
  import java.nio.ByteBuffer;
 +import java.util.HashMap;
 +import java.util.Map;
  import java.util.UUID;
+ import java.util.concurrent.ExecutionException;
  import java.util.zip.CRC32;
  import java.util.zip.Checksum;
  
 +import com.google.common.collect.ImmutableMap;
 +
  import org.junit.Assert;
 +import org.junit.BeforeClass;
  import org.junit.Test;
 -
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
+ import org.apache.cassandra.config.Config;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.KSMetaData;
 +import org.apache.cassandra.config.ParameterizedClass;
  import org.apache.cassandra.db.commitlog.CommitLog;
  import org.apache.cassandra.db.commitlog.CommitLogDescriptor;
- import org.apache.cassandra.db.commitlog.CommitLogSegment;
+ import org.apache.cassandra.db.commitlog.CommitLogSegmentManager;
  import org.apache.cassandra.db.commitlog.ReplayPosition;
+ import org.apache.cassandra.db.commitlog.CommitLogSegment;
 +import org.apache.cassandra.db.compaction.CompactionManager;
  import org.apache.cassandra.db.composites.CellName;
  import org.apache.cassandra.db.composites.CellNameType;
  import org.apache.cassandra.db.filter.NamesQueryFilter;
  import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.gms.Gossiper;
 +import org.apache.cassandra.io.util.ByteBufferDataInput;
 +import org.apache.cassandra.io.util.FileDataInput;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.net.MessagingService;
+ import org.apache.cassandra.service.CassandraDaemon;
+ import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
+ import org.apache.cassandra.utils.JVMStabilityInspector;
+ import org.apache.cassandra.utils.KillerForTests;
  
 -import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
 -
 -public class CommitLogTest extends SchemaLoader
 

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java


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

Branch: refs/heads/trunk
Commit: 6fd41ab158cb68189712ad61d0894d2c58ebac2e
Parents: 67903d7 98a08eb
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat Aug 8 12:36:21 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat Aug 8 12:36:21 2015 +0200

--
 .../apache/cassandra/db/commitlog/AbstractCommitLogService.java   | 3 ++-
 .../org/apache/cassandra/db/commitlog/BatchCommitLogService.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
--
diff --cc 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 2a55600,9f3b410..fa981a3
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -43,12 -43,8 +43,12 @@@ public abstract class AbstractCommitLog
  
  // signal that writers can wait on to be notified of a completed sync
  protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
  
 +final CommitLog commitLog;
 +private final String name;
 +private final long pollIntervalMillis;
 +
  private static final Logger logger = 
LoggerFactory.getLogger(AbstractCommitLogService.class);
  
  /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index b433754,dd55d24..ceb5d64
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@@ -30,7 -30,8 +30,8 @@@ class BatchCommitLogService extends Abs
  {
  // wait until record has been safely persisted to disk
  pending.incrementAndGet();
+ haveWork.release();
 -alloc.awaitDiskSync();
 +alloc.awaitDiskSync(commitLog.metrics.waitingOnCommit);
  pending.decrementAndGet();
  }
  }

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

[benedict]

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
test/unit/org/apache/cassandra/Util.java


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

Branch: refs/heads/trunk
Commit: 7636a6b860cddb614b92721b9886fdbeb23887f9
Parents: 32bc8b0 e1bb792
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Aug 6 14:46:38 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Aug 6 14:46:38 2015 +0200

--
 test/unit/org/apache/cassandra/Util.java|  6 +-
 .../cassandra/concurrent/WaitQueueTest.java | 91 ++--
 2 files changed, 32 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7636a6b8/test/unit/org/apache/cassandra/Util.java
--
diff --cc test/unit/org/apache/cassandra/Util.java
index 08cc093,e05468f..da81aaa
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@@ -382,16 -377,8 +382,20 @@@ public class Uti
  return new RangeTombstone(startName, endName, timestamp , localtime);
  }
  
- 
 +public static void spinAssertEquals(Object expected, SupplierObject s, 
int timeoutInSeconds)
 +{
 +long now = System.currentTimeMillis();
 +while (System.currentTimeMillis() - now  now + (1000 * 
timeoutInSeconds))
 +{
 +if (s.get().equals(expected))
 +break;
 +Thread.yield();
 +}
 +assertEquals(expected, s.get());
 +}
++
+ public static void joinThread(Thread thread) throws InterruptedException
+ {
+ thread.join(1);
+ }
  }

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

[yukim]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 32bc8b0b182176f0132522f821a1b13919efc63a
Parents: 5c59d5a 20f12e9
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 5 16:10:22 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 5 16:10:22 2015 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/NodeProbe.java   | 16 ++
 .../apache/cassandra/tools/nodetool/Info.java   | 23 ++--
 3 files changed, 19 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32bc8b0b/CHANGES.txt
--
diff --cc CHANGES.txt
index 66e5a0c,9a475ea..72ad3cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,8 +1,28 @@@
 -2.1.9
 +2.2.1
 + * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
   * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
   * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
 - * Commit log segment recycling is disabled by default (CASSANDRA-9896)
   * Add consistency level to tracing ouput (CASSANDRA-9827)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
++ * Fix nodetool info error when the node is not joined (CASSANDRA-9031)
 +Merged from 2.0:
 + * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
 + * Don't track hotness when opening from snapshot for validation 
(CASSANDRA-9382)
 +
 +
 +2.2.0
 + * Allow the selection of columns together with aggregates (CASSANDRA-9767)
 + * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
 + * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
 + * sum() and avg() functions missing for smallint and tinyint types 
(CASSANDRA-9671)
 + * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
 +Merged from 2.1:
   * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
   * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
   * Handle corrupt files on startup (CASSANDRA-9686)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32bc8b0b/src/java/org/apache/cassandra/tools/NodeProbe.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32bc8b0b/src/java/org/apache/cassandra/tools/nodetool/Info.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/Info.java
index 5852fc7,000..0d9bd73
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Info.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Info.java
@@@ -1,153 -1,0 +1,162 @@@
 +/*
 + * 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.tools.nodetool;
 +
 +import io.airlift.command.Command;
 +import io.airlift.command.Option;
 +
 +import java.lang.management.MemoryUsage;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +
 +import javax.management.InstanceNotFoundException;
 +
 +import org.apache.cassandra.db.ColumnFamilyStoreMBean;
 +import org.apache.cassandra.io.util.FileUtils;
 +import org.apache.cassandra.service.CacheServiceMBean;
 +import org.apache.cassandra.tools.NodeProbe;
 +import