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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 4f3a6feb22f844a99e1c20c20ae17b2427f81307
Parents: 84ffcb8 afa4563
Author: Aleksey Yeshchenko 
Authored: Mon Dec 10 18:14:14 2018 +
Committer: Aleksey Yeshchenko 
Committed: Mon Dec 10 18:14:14 2018 +

--
 .../operations/SelectOrderByTest.java   | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f3a6feb/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
--


-
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.2' into cassandra-3.0

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: c9dc69dce61618834c0a43ded53e95f2d0480e1b
Parents: c6f822c cf6f792
Author: Aleksey Yeshchenko 
Authored: Tue Nov 20 15:23:42 2018 +
Committer: Aleksey Yeshchenko 
Committed: Tue Nov 20 15:23:42 2018 +

--
 .../SelectMultiColumnRelationTest.java  | 25 
 1 file changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9dc69dc/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
--


-
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.2' into cassandra-3.0

[spod]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 300fff2722ddf2019b428ea0f924aae2eed56016
Parents: ab0e30e dcd92a9
Author: Stefan Podkowinski 
Authored: Mon Oct 15 09:41:22 2018 +0200
Committer: Stefan Podkowinski 
Committed: Mon Oct 15 09:41:59 2018 +0200

--
 .circleci/config.yml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/300fff27/.circleci/config.yml
--


-
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.2' into cassandra-3.0

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 21ec39a9d66b66ce6ca814522eb047cdec0c454f
Parents: d049c6b 62e48c5
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:15:47 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:17:49 2018 +1000

--
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21ec39a9/CHANGES.txt
--
diff --cc CHANGES.txt
index 7049180,71c57ea..d55ddb6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -2.2.14
 +3.0.18
 + * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
 + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
 + * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
 + Merged from 2.2:
+  * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
 -2.2.13
 +
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

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


-
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.2' into cassandra-3.0

[blambov]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 299782cff5a56db8b8fe9ad70a43bea7b729cc99
Parents: 236c47e 49adbe7
Author: Branimir Lambov 
Authored: Tue Aug 21 11:55:38 2018 +0300
Committer: Branimir Lambov 
Committed: Tue Aug 21 11:55:38 2018 +0300

--
 .../io/sstable/IndexSummaryBuilder.java |  4 +-
 .../cassandra/io/util/DataOutputBuffer.java |  8 +-
 .../io/util/DataOutputBufferFixed.java  |  2 +-
 .../cassandra/io/util/SafeMemoryWriter.java | 16 ++--
 .../cassandra/io/util/DataOutputTest.java   |  4 +-
 .../cassandra/io/util/SafeMemoryWriterTest.java | 90 
 6 files changed, 110 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/299782cf/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/299782cf/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
--


-
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.2 into cassandra-3.0

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: c4f1f40803a00df3d2ce31112dfbf6f78e491cf9
Parents: 3acb7d4 0e81892
Author: Benjamin Lerer 
Authored: Thu Aug 2 15:14:17 2018 +0200
Committer: Benjamin Lerer 
Committed: Thu Aug 2 15:15:04 2018 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4f1f408/CHANGES.txt
--
diff --cc CHANGES.txt
index 7de27fd,f3de388..e4dbbda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,7 +1,42 @@@
 -2.2.14
 +3.0.18
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
++ Merged from 2.2:
+  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
 -2.2.13
 +
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
-  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


-
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.2' into cassandra-3.0

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 6ce887e58ac193eb53ecd75d79ead5a93ebda005
Parents: 8ead7af 3482370
Author: Mick Semb Wever 
Authored: Wed Jul 11 10:16:23 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:16:23 2018 +1000

--

--



-
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.2' into cassandra-3.0

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 489c2f69510b001770d9a59e55ba5d5175019050
Parents: 4e23c9e f8912ce
Author: Mick Semb Wever 
Authored: Fri Jun 29 16:53:36 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri Jun 29 16:57:34 2018 +1000

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  66 ++-
 .../db/compaction/AntiCompactionTest.java   | 109 ++-
 3 files changed, 147 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/489c2f69/CHANGES.txt
--
diff --cc CHANGES.txt
index aeeb0ae,9d6a9ea..d694f3b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 -2.2.13
 +3.0.17
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/489c2f69/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ab363e0,013fc04..f033bf2
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -474,6 -460,16 +474,17 @@@ public class CompactionManager implemen
  }, jobs, OperationType.CLEANUP);
  }
  
+ /**
+  * Submit anti-compactions for a collection of SSTables over a set of 
repaired ranges and marks corresponding SSTables
+  * as repaired.
+  *
+  * @param cfs Column family for anti-compaction
+  * @param ranges Repaired ranges to be anti-compacted into separate 
SSTables.
+  * @param sstables {@link Refs} of SSTables within CF to anti-compact.
+  * @param repairedAt Unix timestamp of when repair was completed.
++ * @param parentRepairSession Corresponding repair session
+  * @return Futures 

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

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 897b55a6b56130cb8b9c0af3907b788011623b37
Parents: cce9ab2 1143bc1
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:30:28 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:31:43 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/CHANGES.txt
--
diff --cc CHANGES.txt
index dfdfbfd,7b1089e..94fbcd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,33 @@@
 -2.2.13
 +3.0.17
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/897b55a6/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


-
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.2' into cassandra-3.0

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: cce9ab2362d5c32d503eea2cbfd192685161203b
Parents: b8fb29a fc7a69b
Author: Marcus Eriksson 
Authored: Thu Jun 7 08:39:56 2018 -0700
Committer: Marcus Eriksson 
Committed: Thu Jun 7 08:39:56 2018 -0700

--

--



-
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.2' into cassandra-3.0

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever 
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 18:45:59 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
--
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--


-
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.2' into cassandra-3.0

[jzhuang]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 733f6b0cf8c5f8d89b9a9bf102e9e37548bba601
Parents: e16f0ed 3a71382
Author: Jay Zhuang 
Authored: Tue May 1 15:08:51 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:10:13 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../cassandra/io/util/SequentialWriter.java |   2 +
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |  53 +++
 .../cassandra/io/util/SequentialWriterTest.java |  41 +
 6 files changed, 260 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 857cf96,22ee346..9992802
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.13
 +3.0.17
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
   * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 74258cf,a7f9bb4..43f1fd0
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -132,7 -129,10 +132,7 @@@ public class CompressedSequentialWrite
  // write corresponding checksum
  compressed.rewind();
  crcMetadata.appendDirect(compressed, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
 -
 -// adjust our bufferOffset to account for the new uncompressed 
data we've now written out
 -resetBuffer();
  }
  catch (IOException e)
  {
@@@ -240,6 -239,19 +240,19 @@@
  metadataWriter.resetAndTruncate(realMark.nextChunkIndex - 1);
  }
  
+ private void truncate(long toFileSize, long toBufferOffset)
+ {
+ try
+ {
 -channel.truncate(toFileSize);
++fchannel.truncate(toFileSize);
+ lastFlushOffset = toBufferOffset;
+ }
+ catch (IOException e)
+ {
+ throw new FSWriteError(e, getPath());
+ }
+ }
+ 
  /**
   * Seek to the offset where next compressed data chunk should be stored.
   */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/733f6b0c/src/java/org/apache/cassandra/io/util/SequentialWriter.java

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: bc1f8412954c494aa20a6a123d15b4a269c1ad4b
Parents: e42d9e7 334dca9
Author: Marcus Eriksson 
Authored: Tue Apr 24 08:51:19 2018 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 24 08:51:19 2018 +0200

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/db/compaction/CompactionManager.java | 10 +-
 .../cassandra/db/compaction/AntiCompactionTest.java   |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc1f8412/CHANGES.txt
--
diff --cc CHANGES.txt
index b0fd579,5f6189f..cf470d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,8 +1,27 @@@
 -2.2.13
 +3.0.17
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
   * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 - * Fix query pager DEBUG log leak causing hit in paged reads throughput 
(CASSANDRA-14318)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc1f8412/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index a8e6931,419f66e..ab363e0
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -560,9 -543,9 +560,9 @@@ public class CompactionManager implemen
  
  for (Range r : normalizedRanges)
  {
- if (r.contains(sstableRange))
+ if (r.contains(sstableBounds.left) && 
r.contains(sstableBounds.right))
  {
 -logger.info("SSTable {} fully contained in range {}, 
mutating repairedAt instead of anticompacting", sstable, r);
 +logger.info("[repair #{}] SSTable {} fully contained 
in range {}, mutating repairedAt instead of anticompacting", 
parentRepairSession, sstable, r);
  
sstable.descriptor.getMetadataSerializer().mutateRepairedAt(sstable.descriptor, 
repairedAt);
  sstable.reloadSSTableMetadata();
  mutatedRepairStatuses.add(sstable);
@@@ -572,16 -555,16 +572,16 @@@
  shouldAnticompact = true;
  break;
  }
- else if (sstableRange.intersects(r))
+ else if (r.intersects(sstableBounds))
  {
- logger.info("[repair #{}] SSTable {} ({}) will be 
anticompacted on range {}", parentRepairSession, sstable, sstableRange, r);
 -logger.info("SSTable 

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 598008d43ce88ea276974ec0f247faa0d79c
Parents: 22bb413 594cde7
Author: Benjamin Lerer 
Authored: Tue Apr 17 12:12:48 2018 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 17 12:12:48 2018 +0200

--
 CHANGES.txt |  2 +
 .../org/apache/cassandra/cql3/ResultSet.java|  5 ++
 .../cassandra/cql3/selection/Selection.java | 69 +---
 .../cql3/statements/SelectStatement.java| 19 +++---
 .../cql3/validation/entities/JsonTest.java  | 21 ++
 5 files changed, 97 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/598008d4/CHANGES.txt
--
diff --cc CHANGES.txt
index 9012f8c,967ee05..d3d8036
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,22 @@@
 -2.2.13
 +3.0.17
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
+  * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 - * Fix query pager DEBUG log leak causing hit in paged reads throughput 
(CASSANDRA-14318)
   * Backport circleci yaml (CASSANDRA-14240)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/598008d4/src/java/org/apache/cassandra/cql3/ResultSet.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/598008d4/src/java/org/apache/cassandra/cql3/selection/Selection.java
--
diff --cc src/java/org/apache/cassandra/cql3/selection/Selection.java
index 406f849,5385fc6..6227158
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@@ -399,8 -434,17 +450,10 @@@ public abstract class Selectio
  sb.append(spec.type.toJSONString(buffer, 
protocolVersion));
  }
  sb.append("}");
- return 
Collections.singletonList(UTF8Type.instance.getSerializer().serialize(sb.toString()));
+ List jsonRow = new ArrayList<>();
+ 
jsonRow.add(UTF8Type.instance.getSerializer().serialize(sb.toString()));
+ return jsonRow;
  }
 -
 -private ByteBuffer value(Cell c)
 -{
 -return (c instanceof CounterCell)
 -? 
ByteBufferUtil.bytes(CounterContext.instance().total(c.value()))
 -: c.value();
 -}
  }
  
  private static interface Selectors

http://git-wip-us.apache.org/repos/asf/cassandra/blob/598008d4/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 1e867bc,729cf83..a5e6254
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -911,14 -841,14 +911,14 @@@ public class SelectStatement implement
  
  if (!parameters.orderings.isEmpty())
  {
 +assert !forView;
  

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 41f3b96f81e08af8a95124b9ab50bad03067aab0
Parents: 2d2b1a7 2e5e11d
Author: Jason Brown 
Authored: Thu Apr 5 06:16:13 2018 -0700
Committer: Jason Brown 
Committed: Thu Apr 5 06:20:57 2018 -0700

--
 .../org/apache/cassandra/cql3/functions/FunctionCall.java |  2 ++
 .../cassandra/cql3/validation/entities/JsonTest.java  | 10 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3b96f/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3b96f/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 94b2087,46cdd52..62c6226
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@@ -39,7 -38,7 +39,8 @@@ import java.util.*
  import java.util.concurrent.*;
  import static org.junit.Assert.fail;
  
--public class JsonTest extends CQLTester
++public class
++JsonTest extends CQLTester
  {
  @BeforeClass
  public static void setUp()


-
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.2' into cassandra-3.0

[paulo]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2d2b1a71f8bd8dbd069cb2bc321936e819baa9ad
Parents: 68079e4 ac77e5e
Author: Paulo Motta 
Authored: Fri Mar 30 12:15:17 2018 -0300
Committer: Paulo Motta 
Committed: Fri Mar 30 12:15:17 2018 -0300

--

--



-
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.2' into cassandra-3.0

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: f39e28dc72935647ac4ea33b0a14ad79d1b64180
Parents: 2461187 9715fc0
Author: Jason Brown 
Authored: Mon Feb 19 05:45:50 2018 -0800
Committer: Jason Brown 
Committed: Mon Feb 19 05:49:03 2018 -0800

--
 .circleci/config.yml | 339 ++
 CHANGES.txt  |   2 +
 circle.yml   |  18 ---
 3 files changed, 341 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f39e28dc/CHANGES.txt
--
diff --cc CHANGES.txt
index bbbca08,2e45b85..14a62a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,9 +1,38 @@@
 -2.2.13
 - * Backport circleci yaml (CASSANDRA-14240)
 +3.0.17
  Merged from 2.1:
   * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
++Merged from 2.2:
++ * Backport circleci yaml (CASSANDRA-14240)
  
 -2.2.12
 +3.0.16
 + * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)
 + * Add MinGW uname check to start scripts (CASSANDRA-12940)
 + * Protect against overflow of local expiration time (CASSANDRA-14092)
 + * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
 + * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
 + * Close socket on error during connect on OutboundTcpConnection 
(CASSANDRA-9630)
 + * Set encoding for javadoc generation (CASSANDRA-14154)
 + * Fix index target computation for dense composite tables with dropped 
compact storage (CASSANDRA-14104)
 + * Improve commit log chain marker updating (CASSANDRA-14108)
 + * Extra range tombstone bound creates double rows (CASSANDRA-14008)
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +Merged from 2.2:
   * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
   * Fix race that prevents submitting compaction for a table when executor is 
full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)


-
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.2 into cassandra-3.0

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5050aa3478da8939d800df9f479f928e96842928
Parents: db788fe b800f3c
Author: Benjamin Lerer 
Authored: Thu Dec 14 14:55:24 2017 +0100
Committer: Benjamin Lerer 
Committed: Thu Dec 14 14:55:24 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/service/StartupChecks.java |  33 +-
 .../org/apache/cassandra/utils/JavaUtils.java   | 115 +++
 .../apache/cassandra/utils/JavaUtilsTest.java   |  52 +
 4 files changed, 170 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5050aa34/CHANGES.txt
--
diff --cc CHANGES.txt
index ee90a67,266ed14..0574893
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.2.12
 +3.0.16
 + * Improve commit log chain marker updating (CASSANDRA-14108)
 + * Extra range tombstone bound creates double rows (CASSANDRA-14008)
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +Merged from 2.2:
+  * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
   * Fix race that prevents submitting compaction for a table when executor is 
full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
   * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5050aa34/src/java/org/apache/cassandra/service/StartupChecks.java
--


-
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.2' into cassandra-3.0

[paulo]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 0d12169167fdf58cbf619dee693a4d4e29846a7e
Parents: 4a2b516 35e6d61
Author: Paulo Motta 
Authored: Wed Dec 13 06:40:56 2017 +1100
Committer: Paulo Motta 
Committed: Wed Dec 13 06:40:56 2017 +1100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 15 --
 .../db/compaction/CompactionsBytemanTest.java   | 56 
 3 files changed, 68 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d121691/CHANGES.txt
--
diff --cc CHANGES.txt
index 1ca7902,33fd264..6bfddcc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -2.2.12
 +3.0.16
 + * Extra range tombstone bound creates double rows (CASSANDRA-14008)
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +Merged from 2.2:
+  * Fix race that prevents submitting compaction for a table when executor is 
full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
   * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d121691/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--


-
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.2 into cassandra-3.0

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: dd187d105bce300395f52eb8ca4d8ccaf94a06ea
Parents: d7329a6 02aba73
Author: Benjamin Lerer 
Authored: Tue Dec 12 10:30:29 2017 +0100
Committer: Benjamin Lerer 
Committed: Tue Dec 12 10:32:36 2017 +0100

--
 CHANGES.txt |   1 +
 NEWS.txt|   9 +-
 bin/cassandra   |  19 +-
 conf/cassandra-env.ps1  | 950 ++-
 conf/cassandra-env.sh   |  12 +
 .../apache/cassandra/service/StartupChecks.java |  74 ++
 .../org/apache/cassandra/utils/HeapUtils.java   |  93 +-
 .../cassandra/utils/JVMStabilityInspector.java  |  24 +-
 .../utils/JVMStabilityInspectorTest.java|  28 +-
 9 files changed, 650 insertions(+), 560 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd187d10/CHANGES.txt
--
diff --cc CHANGES.txt
index 8cff716,5200eb1..20ccc4b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,8 +1,84 @@@
 -2.2.12
 +3.0.16
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
 +Merged from 2.2:
+  * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
   * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  
 -2.2.11
 +
 +3.0.15
 + * Improve TRUNCATE performance (CASSANDRA-13909)
 + * Implement short read protection on partition boundaries (CASSANDRA-13595)
 + * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)
 + * Filter header only commit logs before recovery (CASSANDRA-13918)
 + * AssertionError prepending to a list (CASSANDRA-13149)
 + * Fix support for SuperColumn tables (CASSANDRA-12373)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
 + * Improve short read protection performance (CASSANDRA-13794)
 + * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
 + * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)
 + * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
 + * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
 + * Fix counter application order in short read protection (CASSANDRA-12872)
 + * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
 + * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
 + * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
 + * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
 + * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
 + * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 + * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
 + * Better handle corrupt final commitlog segment (CASSANDRA-11995)
 + * 

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: d7329a639f3761cacf360e1345c8bd2aef16a71b
Parents: a9225f9 3cd2c3c
Author: Marcus Eriksson 
Authored: Mon Dec 11 09:00:46 2017 +0100
Committer: Marcus Eriksson 
Committed: Mon Dec 11 09:00:46 2017 +0100

--
 CHANGES.txt |  2 ++
 .../cassandra/db/compaction/CompactionManager.java  |  1 +
 .../org/apache/cassandra/db/compaction/Scrubber.java|  4 +++-
 .../io/sstable/IndexSummaryRedistribution.java  | 12 
 4 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7329a63/CHANGES.txt
--
diff --cc CHANGES.txt
index a5a97db,c1e81fd..8cff716
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,81 -1,7 +1,83 @@@
 -2.2.12
 +3.0.16
 + * Fix SStable ordering by max timestamp in SinglePartitionReadCommand 
(CASSANDRA-14010)
 + * Accept role names containing forward-slash (CASSANDRA-14088)
 + * Optimize CRC check chance probability calculations (CASSANDRA-14094)
 + * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
 + * More frequent commitlog chained markers (CASSANDRA-13987)
 + * Fix serialized size of DataLimits (CASSANDRA-14057)
 + * Add flag to allow dropping oversized read repair mutations 
(CASSANDRA-13975)
 + * Fix SSTableLoader logger message (CASSANDRA-14003)
 + * Fix repair race that caused gossip to block (CASSANDRA-13849)
 + * Tracing interferes with digest requests when using RandomPartitioner 
(CASSANDRA-13964)
 + * Add flag to disable materialized views, and warnings on creation 
(CASSANDRA-13959)
 + * Don't let user drop or generally break tables in system_distributed 
(CASSANDRA-13813)
 + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954)
 + * Mishandling of cells for removed/dropped columns when reading legacy files 
(CASSANDRA-13939)
 + * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
++Merged from 2.2:
+  * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  
 -2.2.11
 +
 +3.0.15
 + * Improve TRUNCATE performance (CASSANDRA-13909)
 + * Implement short read protection on partition boundaries (CASSANDRA-13595)
 + * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)
 + * Filter header only commit logs before recovery (CASSANDRA-13918)
 + * AssertionError prepending to a list (CASSANDRA-13149)
 + * Fix support for SuperColumn tables (CASSANDRA-12373)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
 + * Improve short read protection performance (CASSANDRA-13794)
 + * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
 + * Fix short read protection for tables with no clustering columns 
(CASSANDRA-13880)
 + * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
 + * Prevent integer overflow of timestamps in CellTest and RowsTest 
(CASSANDRA-13866)
 + * Fix counter application order in short read protection (CASSANDRA-12872)
 + * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
 + * Wait for all management tasks to complete before shutting down CLSM 
(CASSANDRA-13123)
 + * INSERT statement fails when Tuple type is used as clustering column with 
default DESC order (CASSANDRA-13717)
 + * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
 + * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
 + * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 + * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
 + * Better handle corrupt final commitlog segment (CASSANDRA-11995)
 + * StreamingHistogram is not thread safe (CASSANDRA-13756)
 + * Fix MV timestamp issues (CASSANDRA-11500)
 + * Better tolerate improperly formatted bcrypt hashes (CASSANDRA-13626) 
 + * Fix race condition in read command serialization (CASSANDRA-13363)
 + * Enable segement creation before recovering commitlogs (CASSANDRA-13587)
 + * Fix 

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: fb92a52624c13969386760b967b7168a87e857bb
Parents: f4014bb 4e834c5
Author: Marcus Eriksson 
Authored: Tue Sep 5 10:38:39 2017 +0200
Committer: Marcus Eriksson 
Committed: Tue Sep 5 10:38:39 2017 +0200

--
 CHANGES.txt |   1 +
 .../io/sstable/format/SSTableReader.java|   8 +-
 .../sstable/IndexSummaryRedistributionTest.java | 142 +++
 3 files changed, 147 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb92a526/CHANGES.txt
--
diff --cc CHANGES.txt
index 870351c,1abd7de..1ed3fe6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,9 +1,40 @@@
 -2.2.11
 +3.0.15
 + * Fix MV timestamp issues (CASSANDRA-11500)
 + * Better tolerate improperly formatted bcrypt hashes (CASSANDRA-13626) 
 + * Fix race condition in read command serialization (CASSANDRA-13363)
 + * Enable segement creation before recovering commitlogs (CASSANDRA-13587)
 + * Fix AssertionError in short read protection (CASSANDRA-13747)
 + * Don't skip corrupted sstables on startup (CASSANDRA-13620)
 + * Fix the merging of cells with different user type versions 
(CASSANDRA-13776)
 + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
 + * Potential AssertionError during ReadRepair of range tombstone and 
partition deletions (CASSANDRA-13719)
 + * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
 + * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
 + * Randomize batchlog endpoint selection with only 1 or 2 racks 
(CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 
(CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and 
its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize 
(Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily 
(CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
 +Merged from 2.2:
+  * Fix load over calculated issue in IndexSummaryRedistribution 
(CASSANDRA-13738)
   * Fix compaction and flush exception not captured (CASSANDRA-13833)
 - * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809)
   * Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
 - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb92a526/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index d56b3e7,885..25ba212
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1123,10 -1169,14 +1123,10 @@@ public abstract class SSTableReader ext
  

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: b0eba5f9c64db18840a4b0e4d56a589c5f2e08cd
Parents: f791c26 e80ede6
Author: Marcus Eriksson 
Authored: Mon Sep 4 15:02:53 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Sep 4 15:02:53 2017 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |   2 +-
 .../db/compaction/CompactionManager.java|   4 +-
 .../db/compaction/CompactionExecutorTest.java   | 107 +++
 4 files changed, 111 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0eba5f9/CHANGES.txt
--
diff --cc CHANGES.txt
index b405fdf,03a78fd..3baa63b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,8 +1,38 @@@
 -2.2.11
 +3.0.15
 + * Better tolerate improperly formatted bcrypt hashes (CASSANDRA-13626) 
 + * Fix race condition in read command serialization (CASSANDRA-13363)
 + * Enable segement creation before recovering commitlogs (CASSANDRA-13587)
 + * Fix AssertionError in short read protection (CASSANDRA-13747)
 + * Don't skip corrupted sstables on startup (CASSANDRA-13620)
 + * Fix the merging of cells with different user type versions 
(CASSANDRA-13776)
 + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
 + * Potential AssertionError during ReadRepair of range tombstone and 
partition deletions (CASSANDRA-13719)
 + * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
 + * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
 + * Randomize batchlog endpoint selection with only 1 or 2 racks 
(CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 
(CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and 
its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize 
(Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily 
(CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
 +Merged from 2.2:
+  * Fix compaction and flush exception not captured (CASSANDRA-13833)
 - * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809)
   * Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
 - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0eba5f9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 7251244,7e36e11..183176c
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -837,12 -899,33 +837,12 @@@ public class ColumnFamilyStore implemen
  {
  synchronized (data)
  {
 -if (previousFlushFailure != null)
 -throw 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 95f1b23bf0405ffdee1d4372980b0106d0c83071
Parents: cf0b6d1 c6dec2f
Author: Aleksey Yeschenko 
Authored: Sat Aug 26 01:25:39 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Aug 26 01:25:39 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f1b23b/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
--
diff --cc src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
index 4dcc9f2,000..371b6a8
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
@@@ -1,38 -1,0 +1,38 @@@
 +/*
 + * 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.batchlog;
 +
 +public interface BatchlogManagerMBean
 +{
 +/**
 + * Counts all batches currently in the batchlog.
 + *
 + * @return total batch count
 + */
 +public int countAllBatches();
 +
 +/**
 + * @return total count of batches replayed since node start
 + */
 +public long getTotalBatchesReplayed();
 +
 +/**
-  * Forces batchlog replay. Returns immediately if replay is already in 
progress.
++ * Forces batchlog replay. Blocks until completion.
 + */
 +public void forceBatchlogReplay() throws Exception;
 +}


-
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.2' into cassandra-3.0

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: dc32ed80d727ca644d2162fbf0fb316811cd1adf
Parents: 8378bfc e1aa7d3
Author: Jason Brown 
Authored: Mon Aug 21 15:33:19 2017 -0700
Committer: Jason Brown 
Committed: Mon Aug 21 15:36:38 2017 -0700

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/transport/Message.java | 6 +-
 src/java/org/apache/cassandra/transport/Server.java  | 9 +
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc32ed80/CHANGES.txt
--
diff --cc CHANGES.txt
index 6faaa48,2fbb7e9..a0a61ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,6 +1,27 @@@
 -2.2.11
 +3.0.15
 + * Randomize batchlog endpoint selection with only 1 or 2 racks 
(CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 
(CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and 
its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize 
(Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily 
(CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
 +Merged from 2.2:
+  * Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
 - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc32ed80/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index f35d507,c91d37d..7df194d
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -327,10 -304,15 +328,18 @@@ public class Server implements Cassandr
  pipeline.addLast("messageDecoder", messageDecoder);
  pipeline.addLast("messageEncoder", messageEncoder);
  
+ // The exceptionHandler will take care of handling 
exceptionCaught(...) events while still running
+ // on the same EventLoop as all previous added handlers in the 
pipeline. This is important as the used
+ // eventExecutorGroup may not enforce strict ordering for channel 
events.
+ // As the exceptionHandler runs in the EventLoop as the previous 
handlers we are sure all exceptions are
+ // correctly handled before the handler itself is removed.
+ // See https://issues.apache.org/jira/browse/CASSANDRA-13649
+ pipeline.addLast("exceptionHandler", exceptionHandler);
+ 
 -pipeline.addLast(server.eventExecutorGroup, "executor", 
dispatcher);
 +if 

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 1a70dede3a33a2e8bf107f44139580b4ace1c9ff
Parents: 3960260 270f690
Author: Benjamin Lerer 
Authored: Tue Aug 8 16:55:26 2017 +0200
Committer: Benjamin Lerer 
Committed: Tue Aug 8 17:08:19 2017 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/config/DatabaseDescriptor.java|  28 ++-
 .../org/apache/cassandra/db/Directories.java|   3 +-
 .../org/apache/cassandra/io/util/FileUtils.java | 181 +--
 4 files changed, 193 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a70dede/CHANGES.txt
--
diff --cc CHANGES.txt
index 1525289,f712333..1f42c70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -2.2.11
 - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 +3.0.15
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 
(CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and 
its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize 
(Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily 
(CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + Merged from 2.2:
++ * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
   * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a70dede/src/java/org/apache/cassandra/db/Directories.java
--
diff --cc src/java/org/apache/cassandra/db/Directories.java
index 68aa6be,fa76b61..ae7700c
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -523,26 -482,7 +523,25 @@@ public class Directorie
  
  public long getAvailableSpace()
  {
- long availableSpace = location.getUsableSpace() - 
DatabaseDescriptor.getMinFreeSpacePerDriveInBytes();
 -return FileUtils.getUsableSpace(location);
++long availableSpace = FileUtils.getUsableSpace(location) - 
DatabaseDescriptor.getMinFreeSpacePerDriveInBytes();
 +return availableSpace > 0 ? availableSpace : 0;
 +}
 +
 +@Override
 +public boolean equals(Object o)
 +{
 +if (this == o) return true;
 +if (o == null || getClass() != o.getClass()) return false;
 +
 +DataDirectory that = (DataDirectory) o;
 +
 +return location.equals(that.location);
- 
 +}
 +
 +@Override
 +public int hashCode()
 +{
 +return location.hashCode();
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a70dede/src/java/org/apache/cassandra/io/util/FileUtils.java
--
diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java
index 0bfbbb1,bf0fae5..80df67b

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7de853bff7375f18328faa2beeed1c0e35ea5e68
Parents: 7251c95 5b982d7
Author: Benjamin Lerer 
Authored: Fri Jul 14 11:31:49 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 14 11:31:49 2017 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/StorageService.java| 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7de853bf/CHANGES.txt
--
diff --cc CHANGES.txt
index bf36769,122ba54..fffda7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,17 +1,65 @@@
 -2.2.11
 - * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
 - * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
 - * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 - * Remove unused max_value_size_in_mb config setting from yaml 
(CASSANDRA-13625
 +3.0.15
 + * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 + Merged from 2.2:
++  * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
 +  * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
 +  * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  
 -
 -2.2.10
 +3.0.14
 + * Ensure int overflow doesn't occur when calculating large partition warning 
size (CASSANDRA-13172)
 + * Ensure consistent view of partition columns between coordinator and 
replica in ColumnFilter (CASSANDRA-13004)
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
   * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks 

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e51c85f2e6045e077dad8575f7737d502fd50414
Parents: af20226 b77e11c
Author: Benjamin Lerer 
Authored: Fri Jul 7 13:31:08 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 7 13:34:32 2017 +0200

--
 CHANGES.txt |  3 +-
 .../org/apache/cassandra/cql3/UserTypes.java|  4 +-
 .../apache/cassandra/db/marshal/TupleType.java  | 45 -
 .../apache/cassandra/db/marshal/UserType.java   | 50 +--
 .../cassandra/serializers/TupleSerializer.java  | 66 +++
 .../serializers/UserTypeSerializer.java | 67 
 .../validation/entities/CollectionsTest.java| 36 +++
 .../cql3/validation/entities/TupleTypeTest.java | 10 ++-
 .../cql3/validation/entities/UserTypesTest.java |  9 +++
 9 files changed, 220 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e51c85f2/CHANGES.txt
--
diff --cc CHANGES.txt
index 52b0027,08c6e48..c98ffd9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,15 +1,61 @@@
 -2.2.11
 - * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 - * Remove unused max_value_size_in_mb config setting from yaml 
(CASSANDRA-13625
 +3.0.15
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
- 
++ Merged from 2.2:
++* Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  
 -
 -2.2.10
 +3.0.14
 + * Ensure int overflow doesn't occur when calculating large partition warning 
size (CASSANDRA-13172)
 + * Ensure consistent view of partition columns between coordinator and 
replica in ColumnFilter (CASSANDRA-13004)
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
   * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to 

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

[jjirsa]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 960e16b892f525f8c356017f31674684c1aae611
Parents: a5a7446 082af0a
Author: Jeff Jirsa 
Authored: Wed Jun 21 17:01:34 2017 -0700
Committer: Jeff Jirsa 
Committed: Wed Jun 21 17:01:34 2017 -0700

--

--



-
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.2' into cassandra-3.0

[mck]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck 
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck 
Committed: Tue Jun 13 14:05:12 2017 +1000

--
 CHANGES.txt |  1 +
 .../apache/cassandra/auth/CassandraRoleManager.java |  4 
 .../apache/cassandra/service/StorageService.java| 16 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
--
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
 -2.2.10
 +3.0.14
 + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +Merged from 2.2:
+  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
   * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses 

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 17a7a806c8a5dd7f92500b17c0d7810608078ce5
Parents: 6b36d9f 5807eca
Author: Stefania Alborghetti 
Authored: Tue Jun 6 08:52:19 2017 +0800
Committer: Stefania Alborghetti 
Committed: Tue Jun 6 08:52:19 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17a7a806/CHANGES.txt
--
diff --cc CHANGES.txt
index 8ab8422,d00ddcb..0076b2c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,9 +1,49 @@@
 -2.2.10
 +3.0.14
 + * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
 + * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)
 + * Fix schema digest mismatch during rolling upgrades from versions before 
3.0.12 (CASSANDRA-13559)
 + * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
- 
++Merged from 2.2:
+  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

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

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: a2f742cd633ddd650b65f841c50ee96ee1da0ef5
Parents: 8ffdd26 3c81aa8
Author: Benjamin Lerer 
Authored: Wed May 31 14:42:17 2017 +0200
Committer: Benjamin Lerer 
Committed: Wed May 31 14:42:17 2017 +0200

--
 CHANGES.txt|   2 +
 build.xml  |   2 +-
 lib/jna-4.0.0.jar  | Bin 914639 -> 0 bytes
 lib/jna-4.4.0.jar  | Bin 0 -> 1091208 bytes
 lib/licenses/jna-4.0.0.txt | 202 
 lib/licenses/jna-4.4.0.txt | 202 
 6 files changed, 205 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f742cd/CHANGES.txt
--
diff --cc CHANGES.txt
index 18dca09,4f3fba8..164470f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,9 +1,45 @@@
 -2.2.10
 +3.0.14
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns 
(CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728) 
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
+  * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f742cd/build.xml
--
diff --cc build.xml
index ce12b90,c50d85b..de6564a
--- a/build.xml
+++ b/build.xml
@@@ -380,8 -377,19 +380,8 @@@

 

-   
 -  
 - 

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 0f118a93f95161aae4bbc75c31c4b9cf9c6225ec
Parents: 6ed9134 6c5ea19
Author: Ariel Weisberg 
Authored: Wed May 3 18:14:30 2017 -0400
Committer: Ariel Weisberg 
Committed: Wed May 3 18:14:30 2017 -0400

--

--



-
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.2' into cassandra-3.0

[spod]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb
Parents: 8bb5f1e 868be9c
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:46:56 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:46:56 2017 +0200

--
 redhat/cassandra | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--

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

[spod]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8bb5f1e0cf15d52e944291a8e4eb90a026770ea3
Parents: 8dbf808 5c6fc5e
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:33:13 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:33:13 2017 +0200

--
 redhat/cassandra | 1 +
 1 file changed, 1 insertion(+)
--

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8dbf808c3d40668cafcec982b38306412ae01b32
Parents: 032a8cc bd540bc
Author: Marcus Eriksson 
Authored: Wed Apr 26 09:38:34 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 26 09:38:34 2017 +0200

--
 test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dbf808c/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
index cd1f295,362afe7..0d5bc81
--- a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
@@@ -80,9 -80,9 +80,9 @@@ public class NeverPurgeTest extends CQL
  execute("DELETE FROM %s WHERE a=3");
  cfs.forceBlockingFlush();
  cfs.enableAutoCompaction();
- while (cfs.getLiveSSTables().size() > 1)
 -while (cfs.getSSTables().size() > 1 || 
!cfs.getTracker().getCompacting().isEmpty())
++while (cfs.getLiveSSTables().size() > 1 || 
!cfs.getTracker().getCompacting().isEmpty())
  Thread.sleep(100);
 -verifyContainsTombstones(cfs.getSSTables(), 3);
 +verifyContainsTombstones(cfs.getLiveSSTables(), 3);
  }
  
  private void testHelper(String deletionStatement) throws Throwable

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

[ifesdjeen]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: b063b38f33474cd0687167599a3a8cec7ed82631
Parents: e5c2a18 31590f5
Author: Alex Petrov 
Authored: Thu Apr 20 11:44:58 2017 +0200
Committer: Alex Petrov 
Committed: Thu Apr 20 11:44:58 2017 +0200

--
 CHANGES.txt| 1 +
 test/unit/org/apache/cassandra/service/RemoveTest.java | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b063b38f/CHANGES.txt
--
diff --cc CHANGES.txt
index 11881e9,33c24ad..81d5b06
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,7 +1,32 @@@
 -2.2.10
 +3.0.14
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728) 
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
+  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

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

[snazy]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 58e8008a50ed9fddf87e92b2199894ce11156f2a
Parents: fee2a3a 470f15b
Author: Robert Stupp 
Authored: Sun Apr 9 10:55:13 2017 +0200
Committer: Robert Stupp 
Committed: Sun Apr 9 10:58:15 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b577dd,366db50..c5e517f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
 -2.2.10
 +3.0.13
 + * Fix startup problems due to schema tables not completely flushed 
(CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns 
(CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data 
(CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled 
(CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors 
(CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup 
checks (CASSANDRA-1)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
+  * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e8008a/src/java/org/apache/cassandra/cache/OHCProvider.java
--

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

[spod]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 13e6699da52ea68f49e04dcfe9d42db85c6701db
Parents: f45f55b a79cc98
Author: Stefan Podkowinski 
Authored: Mon Apr 3 19:58:56 2017 +0200
Committer: Stefan Podkowinski 
Committed: Mon Apr 3 19:59:21 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/13e6699d/CHANGES.txt
--
diff --cc CHANGES.txt
index 5d7b267,c77576b..371abed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,47 -20,7 +43,48 @@@ Merged from 2.1
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
++ * Fix JVM metric names (CASSANDRA-13103)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/13e6699d/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: ac1b7c17db74653ffc771454e0fe9210550589a2
Parents: 25f1065 e5a5fb9
Author: Marcus Eriksson 
Authored: Mon Apr 3 08:33:48 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Apr 3 08:33:48 2017 +0200

--
 .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac1b7c17/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index afbfee1,1d77b17..ce85dc5
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@@ -63,12 -63,12 +63,12 @@@ public class CompactionsCQLTest extend
  public void testTriggerMinorCompactionDTCS() throws Throwable
  {
  createTable("CREATE TABLE %s (id text PRIMARY KEY) WITH compaction = 
{'class':'DateTieredCompactionStrategy', 'min_threshold':2};");
 -
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
 +
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
- execute("insert into %s (id) values ('1')");
+ execute("insert into %s (id) values ('1') using timestamp 1000"); // 
same timestamp = same window = minor compaction triggered
  flush();
- execute("insert into %s (id) values ('1')");
+ execute("insert into %s (id) values ('1') using timestamp 1000");
  flush();
 -waitForMinor(KEYSPACE, currentTable(), 5000, true);
 +waitForMinor(KEYSPACE, currentTable(), SLEEP_TIME, true);
  }
  
  @Test

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

[jkni]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2836a644a357c0992ba89622f04668422ce2761a
Parents: f4ba908 bf0906b
Author: Joel Knighton 
Authored: Wed Mar 22 13:13:44 2017 -0500
Committer: Joel Knighton 
Committed: Wed Mar 22 13:18:59 2017 -0500

--
 CHANGES.txt |  1 +
 .../gms/GossipDigestAckVerbHandler.java | 26 ++---
 src/java/org/apache/cassandra/gms/Gossiper.java | 56 ++--
 .../apache/cassandra/service/MigrationTask.java | 12 ++---
 .../cassandra/service/StorageService.java   | 17 +++---
 5 files changed, 73 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2836a644/CHANGES.txt
--
diff --cc CHANGES.txt
index 6021315,df2421d..9140c73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,9 +1,28 @@@
 -2.2.10
 +3.0.13
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 +Merged from 2.2:
+  * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
   * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
   * Fix queries updating multiple time the same list (CASSANDRA-13130)
   * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 +
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2836a644/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index cbfa750,c2eccba..802ff9c
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -124,6 -128,9 +128,8 @@@ public class Gossiper implements IFailu
  private final Map expireTimeEndpointMap = new 
ConcurrentHashMap();
  
  private volatile boolean inShadowRound = false;
 -
+ // endpoint states as gathered during shadow round
+ private final Map endpointShadowStateMap = 
new ConcurrentHashMap<>();
  
  private volatile long lastProcessedMessageAt = System.currentTimeMillis();
  
@@@ -818,28 -826,6 +827,20 @@@
  return endpointStateMap.get(ep);
  }
  
 +public boolean valuesEqual(InetAddress ep1, InetAddress ep2, 
ApplicationState as)
 +{
 +EndpointState state1 = getEndpointStateForEndpoint(ep1);
 +EndpointState state2 = getEndpointStateForEndpoint(ep2);
 +
 +if (state1 == null || state2 == null)
 +return false;
 +
 +VersionedValue value1 = state1.getApplicationState(as);
 +VersionedValue value2 = state2.getApplicationState(as);
 +
 +return !(value1 == null || value2 == null) && 
value1.value.equals(value2.value);
 +}
 +
- // removes ALL endpoint states; should only be called after shadow gossip
- public void resetEndpointStateMap()
- {
- endpointStateMap.clear();
- unreachableEndpoints.clear();
- liveEndpoints.clear();
- }
- 
  public Set

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

[spod]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: f4ba9083e8251144d14cf367b8ef7d23c65ff2da
Parents: 0eebc6e 06316df
Author: Stefan Podkowinski 
Authored: Mon Mar 20 19:44:10 2017 +0100
Committer: Stefan Podkowinski 
Committed: Mon Mar 20 19:46:56 2017 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/db/compaction/CompactionManager.java  | 12 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ba9083/CHANGES.txt
--
diff --cc CHANGES.txt
index 10402f3,27dd343..6021315
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,8 +1,27 @@@
 -2.2.10
 +3.0.13
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using 
Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 +Merged from 2.2:
+  * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
   * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
   * Fix queries updating multiple time the same list (CASSANDRA-13130)
   * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 +
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ba9083/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 28140e0,d21f1e8..8d470d5
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -22,7 -22,6 +22,8 @@@ import java.io.IOException
  import java.lang.management.ManagementFactory;
  import java.util.*;
  import java.util.concurrent.*;
 +import java.util.function.Predicate;
++import java.util.stream.Collectors;
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
  import javax.management.openmbean.OpenDataException;
@@@ -1222,7 -1212,21 +1223,16 @@@ public class CompactionManager implemen
  logger.info("Performing anticompaction on {} sstables", 
repaired.originals().size());
  
  //Group SSTables
- Collection groupedSSTables = 
cfs.getCompactionStrategyManager().groupSSTablesForAntiCompaction(repaired.originals());
+ Set sstables = repaired.originals();
+ 
+ // Repairs can take place on both unrepaired (incremental + full) and 
repaired (full) data.
+ // Although anti-compaction could work on repaired sstables as well 
and would result in having more accurate
+ // repairedAt values for these, we still avoid anti-compacting 
already repaired sstables, as we currently don't
+ // make use of any actual repairedAt value and splitting up sstables 
just for that is not worth it at this point.
 -Set unrepairedSSTables = 
ImmutableSet.copyOf(Iterables.filter(sstables, new Predicate()
 -{
 -public boolean apply(SSTableReader input)
 -{
 -return !input.isRepaired();
 -}
 -}));
++Set unrepairedSSTables = sstables.stream().filter((s) 

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 0c07840f2ad612a661682f8f17f9485644c4b358
Parents: 44f79bf a69f688
Author: Jason Brown 
Authored: Thu Mar 16 13:25:43 2017 -0700
Committer: Jason Brown 
Committed: Thu Mar 16 13:26:33 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c07840f/CHANGES.txt
--
diff --cc CHANGES.txt
index 140c860,2a8330e..7232d5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,7 +1,23 @@@
 -2.2.10
 +3.0.13
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 +Merged from 2.2:
+  * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
   * Fix queries updating multiple time the same list (CASSANDRA-13130)
   * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 +
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

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

[jjirsa]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 44f79bf2f7a3a05f802014492ecbec67c49c02d0
Parents: aeca1d2 beb9658
Author: Jeff Jirsa 
Authored: Sun Mar 12 21:54:42 2017 -0700
Committer: Jeff Jirsa 
Committed: Sun Mar 12 21:56:00 2017 -0700

--
 CHANGES.txt  |  1 +
 .../cassandra/db/commitlog/CommitLogReplayer.java| 11 +++
 .../apache/cassandra/db/commitlog/CommitLogTest.java | 15 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44f79bf2/CHANGES.txt
--
diff --cc CHANGES.txt
index 52a794b,2839291..140c860
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,22 @@@
 -2.2.10
 +3.0.13
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 +Merged from 2.2:
++ * Commitlog replay may fail if last mutation is within 4 bytes of end of 
segment (CASSANDRA-13282)
   * Fix queries updating multiple time the same list (CASSANDRA-13130)
   * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 +
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44f79bf2/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index d53f0f8,3cf4d0f..205c36a
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -483,6 -439,17 +483,17 @@@ public class CommitLogReplaye
  int serializedSize;
  try
  {
+ // We rely on reading serialized size == 0 
(LEGACY_END_OF_SEGMENT_MARKER) to identify the end
+ // of a segment, which happens naturally due to the 0 padding 
of the empty segment on creation.
 -// However, with 2.1 era commitlogs it's possible that the 
last mutation ended less than 4 bytes 
++// However, it's possible with 2.1 era commitlogs that the 
last mutation ended less than 4 bytes 
+ // from the end of the file, which means that we'll be unable 
to read an a full int and instead 
+ // read an EOF here
+ if(end - reader.getFilePointer() < 4)
+ {
+ logger.trace("Not enough bytes left for another mutation 
in this CommitLog segment, continuing");
+ return false;
+ }
+ 
  // any of the reads may hit EOF
  serializedSize = reader.readInt();
  if (serializedSize == LEGACY_END_OF_SEGMENT_MARKER)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44f79bf2/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java
index c4ab6ab,9b63885..90dc258
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java
@@@ -143,11 -137,25 +143,24 @@@ public class CommitLogTes
  }
  
  @Test
+ public void testRecoveryWithShortPadding() throws Exception
+ {
+ // If we have 0-3 bytes remaining, commitlog replayer
+ // should pass, because there's insufficient room
+ // left in the segment 

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

[blerer]

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: aeca1d2bd8e395a2897c3e36224f49b586babd4e
Parents: 31dec3d 5ef8a8b
Author: Benjamin Lerer 
Authored: Fri Mar 10 10:01:01 2017 +0100
Committer: Benjamin Lerer 
Committed: Fri Mar 10 10:02:21 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/UpdateParameters.java |  24 -
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  43 ++--
 src/java/org/apache/cassandra/db/rows/Row.java  |   6 ++
 .../org/apache/cassandra/utils/btree/BTree.java |  19 
 .../validation/entities/CollectionsTest.java| 100 +++
 .../apache/cassandra/db/rows/RowBuilder.java|   7 ++
 7 files changed, 191 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeca1d2b/CHANGES.txt
--
diff --cc CHANGES.txt
index 1876922,09e4039..52a794b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,21 @@@
 -2.2.10
 +3.0.13
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 +Merged from 2.2:
+  * Fix queries updating multiple time the same list (CASSANDRA-13130)
   * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 +
 +
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeca1d2b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
--
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 0c58097,65edef7..d902dec
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -80,134 -59,71 +80,156 @@@ public class UpdateParameter
  throw new InvalidRequestException(String.format("Out of bound 
timestamp, must be in [%d, %d]", Long.MIN_VALUE + 1, Long.MAX_VALUE));
  }
  
 -public Cell makeColumn(CellName name, ByteBuffer value) throws 
InvalidRequestException
 +public void newRow(Clustering clustering) throws InvalidRequestException
 +{
 +if (metadata.isDense() && !metadata.isCompound())
 +{
 +// If it's a COMPACT STORAGE table with a single clustering 
column, the clustering value is
 +// translated in Thrift to the full Thrift column name, and for 
backward compatibility we
 +// don't want to allow that to be empty (even though this would 
be fine for the storage engine).
 +assert clustering.size() == 1;
 +ByteBuffer value = clustering.get(0);
 +if (value == null || !value.hasRemaining())
 +throw new InvalidRequestException("Invalid empty or null 
value for column " + metadata.clusteringColumns().get(0).name);
 +}
 +
 +if (clustering == Clustering.STATIC_CLUSTERING)
 +{
 +if (staticBuilder == null)
 +staticBuilder = BTreeRow.unsortedBuilder(nowInSec);
 +builder = staticBuilder;
 +}
 +else
 +{
 +if (regularBuilder == null)
 +regularBuilder = BTreeRow.unsortedBuilder(nowInSec);
 +builder = regularBuilder;
 +}
 +
 +builder.newRow(clustering);
 +}
 +
 +public Clustering currentClustering()
 +{
 +return builder.clustering();
 +}
 +
 +public void addPrimaryKeyLivenessInfo()
 +{
 +builder.addPrimaryKeyLivenessInfo(LivenessInfo.create(metadata, 
timestamp, ttl, 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 71c1f986656c83fa62b5ad464b8947efd89e207d
Parents: 50560aa e4be2d0
Author: Aleksey Yeschenko 
Authored: Wed Mar 8 00:19:54 2017 +
Committer: Aleksey Yeschenko 
Committed: Wed Mar 8 00:19:54 2017 +

--
 CHANGES.txt  | 8 +++-
 .../cql3/statements/PermissionsManagementStatement.java  | 5 +
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c1f986/CHANGES.txt
--
diff --cc CHANGES.txt
index 36f058b,0982de9..7551a7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,18 @@@
 -2.2.10
++3.0.13
++Merged from 2.2:
+  * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
++
++
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
- Merged from 2.2
++Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)
@@@ -19,47 -12,8 +24,48 @@@ Merged from 2.1
   * Remove unused repositories (CASSANDRA-13278)
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
+ 
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: ddda768103f75536b1b363c86c79750e34d5e8d8
Parents: 50560aa e835010
Author: Aleksey Yeschenko 
Authored: Tue Mar 7 23:57:35 2017 +
Committer: Aleksey Yeschenko 
Committed: Tue Mar 7 23:57:35 2017 +

--
 CHANGES.txt  | 8 +++-
 .../cql3/statements/PermissionsManagementStatement.java  | 5 +
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddda7681/CHANGES.txt
--
diff --cc CHANGES.txt
index 36f058b,0982de9..7551a7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,18 @@@
 -2.2.10
++3.0.13
++Merged from 2.2:
+  * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
++
++
 +3.0.12
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
- Merged from 2.2
++Merged from 2.2:
   * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)
@@@ -19,47 -12,8 +24,48 @@@ Merged from 2.1
   * Remove unused repositories (CASSANDRA-13278)
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
+ 
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or 

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 77d45ea53ebabd92c02e1da8c143a2826b0cbd5d
Parents: e3968cf 44fefef
Author: Jason Brown 
Authored: Sat Mar 4 15:37:38 2017 -0800
Committer: Jason Brown 
Committed: Sat Mar 4 15:38:20 2017 -0800

--
 test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d45ea5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index f8d01a8,bc5b7bf..7c4ff7a
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -152,12 -144,12 +152,12 @@@ public class DirectoriesTes
  Directories directories = new Directories(cfm);
  assertEquals(cfDir(cfm), 
directories.getDirectoryForNewSSTables());
  
 -Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, 
Descriptor.Type.FINAL);
 +Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
  File snapshotDir = new File(cfDir(cfm),  File.separator + 
Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, 
"42"));
+ assertEquals(snapshotDir.getCanonicalFile(), 
Directories.getSnapshotDirectory(desc, "42"));
  
  File backupsDir = new File(cfDir(cfm),  File.separator + 
Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), 
Directories.getBackupsDirectory(desc));
  }
  }
  

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

[mshuler]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 244f887f4c61ed75cc7250386b4ae5371e79f48f
Parents: e11f750 288d243
Author: Michael Shuler 
Authored: Fri Mar 3 12:42:00 2017 -0600
Committer: Michael Shuler 
Committed: Fri Mar 3 12:42:00 2017 -0600

--
 debian/control| 2 +-
 redhat/cassandra.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f887f/debian/control
--
diff --cc debian/control
index 2d30077,d45a875..6a0128e
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: mis
  Priority: extra
  Maintainer: Eric Evans 
  Uploaders: Sylvain Lebresne 
- Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 -Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.9), 
ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion
++Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), 
ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion
  Homepage: http://cassandra.apache.org
  Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
  Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git

http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f887f/redhat/cassandra.spec
--
diff --cc redhat/cassandra.spec
index a1bfa5d,c3c22d0..d5e743d
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@@ -18,9 -18,9 +18,9 @@@ URL:   http://cassandra.apache.
  Source0:   %{relname}-src.tar.gz
  BuildRoot: %{_tmppath}/%{relname}root-%(%{__id_u} -n)
  
- BuildRequires: ant
+ BuildRequires: ant >= 1.9
  
 -Requires:  jre >= 1.7.0
 +Requires:  jre >= 1.8.0
  Requires:  python(abi) >= 2.7
  Requires(pre): user(cassandra)
  Requires(pre): group(cassandra)

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

[mshuler]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 143c503395418ba87db015b07e6a9e98fa120803
Parents: 815508f c0f99c4
Author: Michael Shuler 
Authored: Wed Mar 1 18:47:23 2017 -0600
Committer: Michael Shuler 
Committed: Wed Mar 1 18:47:23 2017 -0600

--

--

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

[paulo]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 815508f1c240bbbac8246be56e15b1d09c1301b8
Parents: 218743d 06feaef
Author: Paulo Motta 
Authored: Wed Mar 1 20:33:16 2017 -0300
Committer: Paulo Motta 
Committed: Wed Mar 1 20:33:16 2017 -0300

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/ConnectionHandler.java  | 26 +++-
 2 files changed, 15 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/815508f1/CHANGES.txt
--
diff --cc CHANGES.txt
index c4622ab,ca1aa27..ec3d826
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,8 +1,13 @@@
 -2.2.10
 +3.0.12
+  * Avoid race on receiver by starting streaming sender thread after sending 
init message (CASSANDRA-12886)
 + * Update c.yaml doc for offheap memtables (CASSANDRA-13179)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
   * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)
 - * Make sure compaction stats are updated when compaction is interrupted 
(Backport from 3.0, CASSANDRA-12100)
   * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/815508f1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--
diff --cc src/java/org/apache/cassandra/streaming/ConnectionHandler.java
index b83c089,fe551a8..aa1c615
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@@ -215,8 -213,10 +215,10 @@@ public class ConnectionHandle
  {
  this.socket = socket;
  this.protocolVersion = protocolVersion;
+ if (initiator)
+ sendInitMessage();
  
 -new Thread(this, name() + "-" + session.peer).start();
 +new Thread(NamedThreadFactory.threadLocalDeallocator(this), 
name() + "-" + session.peer).start();
  }
  
  public ListenableFuture close()

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg 
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 19:49:52 2017 -0500

--
 CHANGES.txt | 1 +
 build.xml   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
 -2.2.10
 +3.0.12
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
+  * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
   * Coalescing strategy sleeps too much (CASSANDRA-13090)
 - * Make sure compaction stats are updated when compaction is interrupted 
(Backport from 3.0, CASSANDRA-12100)
   * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
--
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
  


+   
  
  
 -  
 -  
 -  
 -  
  

  
@@@ -1131,10 -1181,9 +1133,10 @@@
   debug="true"
   debuglevel="${debuglevel}"
   destdir="${test.classes}"
-  includeantruntime="false"
+  includeantruntime="true"
   source="${source.version}" 
 - target="${target.version}">
 + target="${target.version}"
 + encoding="utf-8">
   
  
   

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: df28bcfaaa3df95bcd06a399e487b4174ff96462
Parents: a5ce963 3748bf7
Author: Ariel Weisberg 
Authored: Tue Feb 28 17:58:33 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 17:59:37 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df28bcfa/CHANGES.txt
--
diff --cc CHANGES.txt
index 1100bfd,e7e0367..5cdc2e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,10 @@@
 -2.2.10
 +3.0.12
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy deserializer can create unexpected boundary range tombstones 
(CASSANDRA-13237)
 + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
 +Merged from 2.2
+  * Coalescing strategy sleeps too much (CASSANDRA-13090)
 - * Make sure compaction stats are updated when compaction is interrupted 
(Backport from 3.0, CASSANDRA-12100)
   * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
   * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
@@@ -11,48 -8,7 +12,47 @@@
  Merged from 2.1:
   * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating 

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 42977dbcea5b81ef3cd679808e06a0846ce9b167
Parents: 61f0c98 dffb1a6
Author: Stefania Alborghetti 
Authored: Thu Feb 23 09:04:42 2017 +
Committer: Stefania Alborghetti 
Committed: Thu Feb 23 09:04:42 2017 +

--

--

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

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

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


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

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

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

[paulo]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5fba118e95b6bc834169141514b8f563d5ffe6fb
Parents: f70d8c0 88f36a0
Author: Paulo Motta 
Authored: Wed Feb 22 17:19:08 2017 -0300
Committer: Paulo Motta 
Committed: Wed Feb 22 17:19:08 2017 -0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fba118e/CHANGES.txt
--
diff --cc CHANGES.txt
index a4bb9cd,1a22814..b744b40
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,7 @@@
 -2.2.10
 +3.0.12
 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
- 
 +Merged from 2.2
+  * Fix failing COPY TO STDOUT (CASSANDRA-12497)
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
  Merged from 2.1:

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

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 50222647481396c15d2465eced02c007f1493b53
Parents: 0020e79 c6462d7
Author: Ariel Weisberg 
Authored: Tue Feb 21 12:13:55 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 21 12:13:55 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt
--
diff --cc CHANGES.txt
index 922e7f7,78f55f6..f2419d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,48 -2,8 +3,48 @@@ Merged from 2.
   * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
+  * Coalescing strategy sleeps too much (CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 0020e79f8e5b46f29537c65d3bdb27308acbff8b
Parents: e2bdf99 3f45010
Author: Sam Tunnicliffe 
Authored: Mon Feb 20 11:50:40 2017 +
Committer: Sam Tunnicliffe 
Committed: Mon Feb 20 12:00:25 2017 +

--
 CHANGES.txt |  1 +
 .../cassandra/service/QueryPagerTest.java   | 82 +++-
 2 files changed, 79 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0020e79f/CHANGES.txt
--
diff --cc CHANGES.txt
index af06a02,7073356..922e7f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,8 +1,49 @@@
 -2.2.10
 +3.0.12
 +Merged from 2.2
+  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
   * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
  
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
   * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0020e79f/test/unit/org/apache/cassandra/service/QueryPagerTest.java
--
diff --cc test/unit/org/apache/cassandra/service/QueryPagerTest.java
index bfc66e0,33a7585..34f1bcf
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ 

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e2bdf9971da514d260176663bbd8cc24f2d60049
Parents: 338226e 8556a2b
Author: Jason Brown 
Authored: Fri Feb 17 13:33:46 2017 -0800
Committer: Jason Brown 
Committed: Fri Feb 17 13:35:40 2017 -0800

--
 CHANGES.txt |  4 
 .../cassandra/net/OutboundTcpConnection.java| 22 
 2 files changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2bdf997/CHANGES.txt
--
diff --cc CHANGES.txt
index ab345e6,1b83501..af06a02
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,7 +1,48 @@@
 -2.2.10
++3.0.12
++Merged from 2.2
+  * Exceptions encountered calling getSeeds() breaks OTC thread 
(CASSANDRA-13018)
+ 
 -2.2.9
 +3.0.11
 + * Use keyspace replication settings on system.size_estimates table 
(CASSANDRA-9639)
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
   * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)

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

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 82943d6aa7564222f43e6c6f9e6d599ebd9dbbe2
Parents: 3d01e90 9a80f80
Author: Ariel Weisberg 
Authored: Tue Feb 14 15:12:39 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 14 15:12:39 2017 -0500

--
 conf/cassandra.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82943d6a/conf/cassandra.yaml
--

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

[aweisberg]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 3d01e906152f02f826a9663afb4a1232060ad584
Parents: 3a570d7 5725e2c
Author: Ariel Weisberg 
Authored: Mon Feb 13 13:00:20 2017 -0500
Committer: Ariel Weisberg 
Committed: Mon Feb 13 13:23:39 2017 -0500

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml | 27 +
 .../org/apache/cassandra/config/Config.java |  3 +-
 .../cassandra/config/DatabaseDescriptor.java| 16 
 .../cassandra/net/OutboundTcpConnection.java|  4 +-
 .../cassandra/utils/CoalescingStrategies.java   | 32 
 .../utils/CoalescingStrategiesTest.java | 40 
 7 files changed, 114 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/CHANGES.txt
--
diff --cc CHANGES.txt
index ac3d1ed,4052b0f..b19550a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,5 +1,44 @@@
 -2.2.9
 +3.0.11
 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Coalescing strategy sleeps too much and shouldn't be enabled by default 
(CASSANDRA-13090)
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/conf/cassandra.yaml
--

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

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

[jjirsa]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 51e3660c77181403bc841a9eae7a7dd2e8ad3414
Parents: 8ec6090 7e05f39
Author: Jeff Jirsa 
Authored: Sat Feb 11 23:28:47 2017 -0800
Committer: Jeff Jirsa 
Committed: Sat Feb 11 23:29:11 2017 -0800

--
 CHANGES.txt |  1 +
 .../DecayingEstimatedHistogramReservoir.java|  3 +-
 ...DecayingEstimatedHistogramReservoirTest.java | 31 
 3 files changed, 34 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e3660c/CHANGES.txt
--
diff --cc CHANGES.txt
index 700bde0,214fe97..b720a0e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,8 +1,48 @@@
 -2.2.9
 +3.0.11
 + * Hint related logging should include the IP address of the destination in 
addition to 
 +   host ID (CASSANDRA-13205)
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)
 - * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
   * 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)

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

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: cc384a5d7959cc2be50be126303d7aa3377d2297
Parents: 883c9f0 2593809
Author: T Jake Luciani 
Authored: Fri Feb 3 15:13:25 2017 -0500
Committer: T Jake Luciani 
Committed: Fri Feb 3 15:13:25 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc384a5d/CHANGES.txt
--
diff --cc CHANGES.txt
index dc10e1f,086e0e5..1d6b53c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,6 +1,39 @@@
 -2.2.9
 +3.0.11
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
-  * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
+  * Fix speculative retry bugs (CASSANDRA-13009)
 - * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
++ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
   * 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)
@@@ -183,10 -62,12 +184,10 @@@ Merged from 2.2
   * 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) 
 - * Add system property to 

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

[snazy]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 6e716c6da41900950e32a5549b3bb1e858ecad18
Parents: c0765ed 6f360b6
Author: Robert Stupp 
Authored: Thu Jan 5 22:20:31 2017 +0100
Committer: Robert Stupp 
Committed: Thu Jan 5 22:20:31 2017 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt|  3 ++
 doc/cql3/CQL.textile|  2 +-
 lib/jsr223/clojure/README.txt   |  8 ---
 lib/jsr223/groovy/README.txt| 35 -
 lib/jsr223/jaskell/README.txt   |  5 --
 lib/jsr223/jruby/README.txt | 54 
 lib/jsr223/jython/README.txt| 33 
 lib/jsr223/scala/README.txt | 37 --
 .../cql3/functions/ScriptBasedUDFunction.java   | 30 +--
 .../cql3/validation/entities/UFScriptTest.java  |  3 +-
 .../validation/entities/UFSecurityTest.java | 12 -
 12 files changed, 29 insertions(+), 194 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e716c6d/CHANGES.txt
--
diff --cc CHANGES.txt
index 666a771,b41313d..77a310d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -2.2.9
 +3.0.11
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e716c6d/NEWS.txt
--
diff --cc NEWS.txt
index 32b5084,37949a1..b4e6551
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,77 -13,20 +13,80 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -2.2.9
 +3.0.11
  =
  
 +Upgrading
 +-
 +   - Nothing specific to this release, but please see previous versions 
upgrading section,
 + especially if you are upgrading from 2.2.
 +   - Specifying the default_time_to_live option when creating or altering a
 + materialized view was erroneously accepted (and ignored). It is now
 + properly rejected.
++   - Only Java and JavaScript are now supported UDF languages.
++ The sandbox in 3.0 already prevented the use of script languages except 
Java
++ and JavaScript.
 +
 +3.0.10
 +=
 +
 +Upgrading
 +-
 +   - memtable_allocation_type: offheap_buffers is no longer allowed to be 
specified in the 3.0 series.
 + This was an oversight that can cause segfaults. Offheap was 
re-introduced in 3.4 see CASSANDRA-11039
 + and CASSANDRA-9472 for details.
 +
 +3.0.9
 +=
 +
 +Upgrading
 +-
 +   - The ReversedType behaviour has been corrected for clustering columns of
 + 

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

[carl]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5f64ed7cc2d62543f0be7b5eb09bd2495a0e4f3a
Parents: 4d5a53e a449e8f
Author: Carl Yeksigian 
Authored: Mon Dec 5 11:41:52 2016 -0500
Committer: Carl Yeksigian 
Committed: Mon Dec 5 11:41:52 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f64ed7c/CHANGES.txt
--
diff --cc CHANGES.txt
index 8cdca57,302becf..5cacdd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.2.9
 +3.0.11
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * 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)

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

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 59b40b3173933620bc5f30e26366cd09b3a4ca10
Parents: eb41380 9cd7d54
Author: Aleksey Yeschenko 
Authored: Fri Nov 18 17:29:41 2016 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 18 17:30:46 2016 +

--
 CHANGES.txt |   3 +
 .../apache/cassandra/locator/TokenMetadata.java | 213 +++
 .../service/PendingRangeCalculatorService.java  |   6 +-
 .../gms/PendingRangeCalculatorServiceTest.java  | 133 
 4 files changed, 267 insertions(+), 88 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59b40b31/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index b50db00,aafd7f9..b44a1a1
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -128,15 -123,6 +128,15 @@@ public class TokenMetadat
  sortedTokens = 

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

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

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


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

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

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 304c47f1546545341d5582f0fec9ce1b746ece73
Parents: d81a490 ebf3507
Author: Sam Tunnicliffe 
Authored: Fri Nov 11 16:14:56 2016 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 11 16:14:56 2016 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/304c47f1/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: d81a49076b694301fdc385af69b57f39a86a22d2
Parents: 14b52bc 5e4198f
Author: Sam Tunnicliffe 
Authored: Fri Nov 11 11:28:33 2016 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 11 11:28:33 2016 +

--
 .../cassandra/auth/CassandraRoleManager.java| 23 +++-
 1 file changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d81a4907/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 5e3b92d,a90b297..c3e2626
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -163,12 -163,15 +163,11 @@@ public class CassandraRoleManager imple
  // to be added.
  if (Schema.instance.getCFMetaData(AuthKeyspace.NAME, "users") != null)
  {
-  legacySelectUserStatement = (SelectStatement) prepare("SELECT * 
FROM %s.%s WHERE name = ?",
-
AuthKeyspace.NAME,
-
LEGACY_USERS_TABLE);
+ legacySelectUserStatement = prepareLegacySelectUserStatement();
+ 
 -scheduleSetupTask(new Callable()
 -{
 -public Void call() throws Exception
 -{
 -convertLegacyData();
 -return null;
 -}
 +scheduleSetupTask(() -> {
 +convertLegacyData();
 +return null;
  });
  }
  else

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 14b52bca30e74b8fdadf723bd2c23d6cff7fe9dd
Parents: 77eee18 2e21cac
Author: Stefania Alborghetti 
Authored: Fri Nov 11 10:57:47 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Nov 11 11:00:13 2016 +0800

--
 CHANGES.txt|  3 ++-
 pylib/cqlshlib/copyutil.py | 11 +++
 2 files changed, 9 insertions(+), 5 deletions(-)
--


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

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

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: bfa8c8070a92a424597e55e2d3618604351e71d1
Parents: 4e0bced ca85bec
Author: Sam Tunnicliffe 
Authored: Thu Nov 10 10:01:30 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Nov 10 10:01:30 2016 +

--
 .../io/sstable/IndexSummaryManager.java | 14 ++--
 .../io/sstable/IndexSummaryManagerTest.java | 67 
 2 files changed, 61 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfa8c807/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfa8c807/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
index 0498c68,a1c0e77..9737281
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
@@@ -648,8 -638,13 +645,13 @@@ public class IndexSummaryManagerTes
  });
  t.start();
  while (CompactionManager.instance.getActiveCompactions() == 0 && 
t.isAlive())
 -Thread.yield();
 +Thread.sleep(1);
+ // to ensure that the stop condition check in 
IndexSummaryRedistribution::redistributeSummaries
+ // is made *after* the halt request is made to the CompactionManager, 
don't allow the redistribution
+ // to proceed until stopCompaction has been called.
  CompactionManager.instance.stopCompaction("INDEX_SUMMARY");
+ // allows the redistribution to proceed
+ barrier.countDown();
  t.join();
  
  assertNotNull("Expected compaction interrupted exception", 
exception.get());

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

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

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


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

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e4f840aa1f84f008cf7c14bdd6a22aebd1b41c70
Parents: e9ff6ae 312e21b
Author: Sam Tunnicliffe 
Authored: Fri Oct 28 16:08:29 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Fri Oct 28 16:08:29 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraAuthorizer.java | 14 +--
 .../cassandra/auth/PasswordAuthenticator.java   | 40 ++--
 3 files changed, 40 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4f840aa/CHANGES.txt
--
diff --cc CHANGES.txt
index 9910245,b33ef8d..bf1e7d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
 -2.2.9
 +3.0.10
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4f840aa/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4f840aa/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
--

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: ee85507c2634261c77b188ee153f141b6dc511a0
Parents: 5883e43 2122ff8
Author: Stefania Alborghetti 
Authored: Tue Oct 25 09:42:46 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Oct 25 09:42:46 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee85507c/CHANGES.txt
--
diff --cc CHANGES.txt
index 46f27a6,a22439b..6d38f83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,30 @@@
 -2.2.9
 +3.0.10
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * 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)

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

[jjirsa]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5883e43587a110fa21adc5e883aa62c5e3780924
Parents: 7976d65 2871377
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:02:58 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:03:44 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt
--
diff --cc CHANGES.txt
index f14eb22,8b61da4..46f27a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2
   * Fix merkle tree depth calculation (CASSANDRA-12580)
   * Make Collections deserialization more robust (CASSANDRA-12618)
   * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 -===
 -2.1.17
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: a889852706866e4c2fd04d4d2397ff088973f5e8
Parents: 6c64074 4eed687
Author: Sam Tunnicliffe 
Authored: Thu Oct 13 17:48:33 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Oct 13 17:48:33 2016 +0100

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/auth/AuthMigrationListener.java | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8898527/CHANGES.txt
--
diff --cc CHANGES.txt
index a962994,41e3f94..f291674
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -2.2.9
 +3.0.10
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
+  * 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)

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

[marcuse]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 7a274dd36cd6e6bd5c1c5e8d7645945ba74bfa84
Parents: 76f1750 7232d72
Author: Marcus Eriksson 
Authored: Thu Oct 13 15:02:19 2016 +0200
Committer: Marcus Eriksson 
Committed: Thu Oct 13 15:03:00 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  7 -
 .../cassandra/db/ColumnFamilyMetricTest.java| 29 
 3 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a274dd3/CHANGES.txt
--
diff --cc CHANGES.txt
index 13800da,682f12b..dc7bcab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.2.9
 +3.0.10
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a274dd3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index fb3665b,c6b69dc..adfd1af
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1184,23 -1343,104 +1184,28 @@@ public class ColumnFamilyStore implemen
  {
  long start = System.nanoTime();
  Memtable mt = data.getMemtableFor(opGroup, replayPosition);
 -final long timeDelta = mt.put(key, columnFamily, indexer, opGroup);
 -maybeUpdateRowCache(key);
 -metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), 
key.hashCode(), 1);
 -metric.writeLatency.addNano(System.nanoTime() - start);
 -// CASSANDRA-7 - certain resolution paths on memtable put can 
result in very
 -// large time deltas, either through a variety of sentinel timestamps 
(used for empty values, ensuring
 -// a minimal write, etc). This limits the time delta to the max value 
the histogram
 -// can bucket correctly. This also filters the Long.MAX_VALUE case 
where there was no previous value
 -// to update.
 -if(timeDelta < Long.MAX_VALUE)
 -
metric.colUpdateTimeDeltaHistogram.update(Math.min(18165375903306L, timeDelta));
 -}
 -
 -/**
 - * Purges gc-able top-level and range tombstones, returning `cf` if there 
are any columns or tombstones left,
 - * null otherwise.
 - * @param gcBefore a timestamp (in seconds); tombstones with a 
localDeletionTime before this will be purged
 - */
 -public static ColumnFamily removeDeletedCF(ColumnFamily cf, int gcBefore)
 -{
 -// purge old top-level and range tombstones
 -cf.purgeTombstones(gcBefore);
 -
 -// if there are no columns or tombstones left, return null
 -return !cf.hasColumns() && !cf.isMarkedForDelete() ? null : cf;
 -}
 -
 -/**
 - * 

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

[jjirsa]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 703b151b151b7abcfe5b5aa26fe6349506c33da8
Parents: 74f1e0a ff5c497
Author: Jeff Jirsa 
Authored: Tue Oct 11 21:24:07 2016 -0700
Committer: Jeff Jirsa 
Committed: Tue Oct 11 21:25:33 2016 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraRoleManager.java| 22 +++-
 .../serializers/BooleanSerializer.java  |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/703b151b/CHANGES.txt
--
diff --cc CHANGES.txt
index 186a8d3,ae9ef7a..81fb544
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,6 -2,10 +17,7 @@@ Merged from 2.2
   * 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)
 - 
 - 
 -2.2.8
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block

http://git-wip-us.apache.org/repos/asf/cassandra/blob/703b151b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 74f1e0aaa84d20248c26e3b8850969934f54452a
Parents: 72c9eb2 73b888d
Author: Stefania Alborghetti 
Authored: Wed Oct 12 09:49:11 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Oct 12 09:49:11 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f1e0aa/CHANGES.txt
--
diff --cc CHANGES.txt
index 9f7fff8,6ee2ddc..186a8d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,68 -2,13 +17,68 @@@ Merged from 2.2
   * 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)
 - 
 - 
 -2.2.8
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
-  * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
+  * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * 

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 695065e27a16c30019f34fc4c626a1841616d037
Parents: 45d0176 be6e6ea
Author: Stefania Alborghetti 
Authored: Fri Oct 7 16:51:10 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Oct 7 16:52:01 2016 +0800

--
 CHANGES.txt |   1 +
 .../DebuggableScheduledThreadPoolExecutor.java  |   2 +-
 .../concurrent/ScheduledExecutors.java  |   4 -
 .../db/compaction/CompactionManager.java| 127 +++
 .../db/lifecycle/LifecycleTransaction.java  |  14 +-
 .../io/sstable/format/SSTableReader.java|  15 ++-
 .../apache/cassandra/net/MessagingService.java  |   3 +-
 .../cassandra/service/StorageService.java   |  12 +-
 .../org/apache/cassandra/utils/ExpiringMap.java |   4 +-
 9 files changed, 116 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/695065e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 827a208,54425fa..894113a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,10 +1,20 @@@
 -2.2.9
 +3.0.10
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
+  * 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)
 - 
 - 
 -2.2.8
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block

http://git-wip-us.apache.org/repos/asf/cassandra/blob/695065e2/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/695065e2/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 4d1757e,626bd27..478b896
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -171,17 -164,15 +171,15 @@@ public class CompactionManager implemen
  logger.trace("Scheduling a background task check for {}.{} with {}",
   cfs.keyspace.getName(),
   cfs.name,
 - cfs.getCompactionStrategy().getName());
 + cfs.getCompactionStrategyManager().getName());
- List futures = new ArrayList<>();
- // we must schedule it at least once, otherwise compaction will stop 
for a CF until next flush
- if (executor.isShutdown())
+ 
+ List futures = new ArrayList<>(1);
+ Future fut = executor.submitIfRunning(new 
BackgroundCompactionCandidate(cfs), "background task");
+ if (!fut.isCancelled())
  {
- logger.info("Executor has shut down, not submitting background 
task");
- return Collections.emptyList();
+ compactingCF.add(cfs);
+ futures.add(fut);
  }
- compactingCF.add(cfs);
- futures.add(executor.submit(new BackgroundCompactionCandidate(cfs)));
- 
  return futures;
  }
  

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 413e48e6571e3c23362d5053e0c7fcdd99bd1e7d
Parents: 5cebd1f c70ce63
Author: Yuki Morishita 
Authored: Thu Sep 29 14:32:49 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Sep 29 14:32:49 2016 -0500

--
 CHANGES.txt |   3 +-
 .../db/compaction/CompactionManager.java|   6 +-
 .../org/apache/cassandra/repair/Validator.java  |   9 +-
 .../org/apache/cassandra/utils/MerkleTree.java  |  10 ++
 .../org/apache/cassandra/utils/MerkleTrees.java |  10 ++
 .../db/compaction/CompactionsTest.java  |   2 +-
 .../apache/cassandra/repair/ValidatorTest.java  | 167 ---
 7 files changed, 146 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/413e48e6/CHANGES.txt
--
diff --cc CHANGES.txt
index f2f8dac,97bc70a..9076e7a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,13 +1,78 @@@
 -2.2.9
 +3.0.10
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +Merged from 2.2:
+  * Fix merkle tree depth calculation (CASSANDRA-12580)
+  * Make Collections deserialization more robust (CASSANDRA-12618)
 - 
 - 
 -2.2.8
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
-  * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: d0fc95312bb17f71baa1fbf365b5ec4b7fc21342
Parents: f255370 465bb5d
Author: Aleksey Yeschenko 
Authored: Tue Aug 23 13:32:19 2016 +0300
Committer: Aleksey Yeschenko 
Committed: Tue Aug 23 13:32:19 2016 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fc9531/CHANGES.txt
--
diff --cc CHANGES.txt
index 07ee59f,a3a34c1..d384fb3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,5 +1,42 @@@
 -2.2.8
 +3.0.9
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
   * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fc9531/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 0f2fd28,4cb5ed7..7c929e7
--- 

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e6dd15245b87480cfda6b34f9834f341d161ee34
Parents: 74ac3ce 88b3cfc
Author: Yuki Morishita 
Authored: Mon Aug 15 10:09:46 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Aug 15 10:09:46 2016 -0500

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


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

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

[jasobrown]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 74ac3cef1068d46046560b4bf80fd1f47a439510
Parents: 5fdb90e 315356c
Author: Jason Brown 
Authored: Sun Aug 14 08:44:04 2016 -0700
Committer: Jason Brown 
Committed: Sun Aug 14 08:44:32 2016 -0700

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


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

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

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2691c9e4e12a72f143bb2f00d076ecbfad59f4e4
Parents: 465def8 2e90259
Author: T Jake Luciani 
Authored: Wed Aug 10 14:39:52 2016 -0400
Committer: T Jake Luciani 
Committed: Wed Aug 10 14:39:52 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2691c9e4/CHANGES.txt
--
diff --cc CHANGES.txt
index 86746ad,05059cc..e1bc9f3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,7 +1,38 @@@
 -2.2.8
 +3.0.9
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2691c9e4/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
--
diff --cc src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
index 1cd3b6c,8e5671b..2d4cbf9
--- a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
+++ b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
@@@ -65,31 -58,17 

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 62ef8617cdaa07fa37b1b2121ad5923da64e74a3
Parents: 676b6a8 76e3100
Author: Yuki Morishita 
Authored: Tue Aug 9 16:45:52 2016 -0500
Committer: Yuki Morishita 
Committed: Tue Aug 9 16:45:52 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62ef8617/CHANGES.txt
--
diff --cc CHANGES.txt
index 78bd32d,232203e..f613c5f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,6 +1,35 @@@
 -2.2.8
 +3.0.9
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62ef8617/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index e6c56cb,60daee6..86f1016
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -171,8 -170,11 +171,12 @@@ public class 

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 47e63feb1720c0e427bdd019acfc1312d0b60fe4
Parents: 2d73f3b bc9af92
Author: Yuki Morishita 
Authored: Mon Aug 8 07:54:19 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Aug 8 07:54:19 2016 -0500

--

--

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

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 1cce9eb5b85d7d0cb1ac069a2e59c4b7d74af517
Parents: 150307e 3cda682
Author: T Jake Luciani 
Authored: Fri Aug 5 11:34:14 2016 -0400
Committer: T Jake Luciani 
Committed: Fri Aug 5 11:34:14 2016 -0400

--
 CHANGES.txt |   2 +
 build.xml   |   2 +
 lib/licenses/metrics-jvm-3.1.0.txt  | 202 +++
 lib/metrics-jvm-3.1.0.jar   | Bin 0 -> 35907 bytes
 .../cassandra/service/CassandraDaemon.java  |  12 +-
 5 files changed, 217 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cce9eb5/CHANGES.txt
--
diff --cc CHANGES.txt
index b596fc9,67c79de..c051662
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,56 -1,26 +1,58 @@@
 -2.2.8
 +3.0.9
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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:
+  * 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)
 

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: cc8f6cc510f3799dde89c9e1e3cbf7515c2113f9
Parents: 52be7ba 0398521
Author: Yuki Morishita 
Authored: Wed Aug 3 20:18:08 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Aug 3 20:18:08 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8f6cc5/CHANGES.txt
--
diff --cc CHANGES.txt
index f0ceb70,87228d3..49733d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,6 +1,33 @@@
 -2.2.8
 +3.0.9
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8f6cc5/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
--
diff --cc 
src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
index 2b5047d,b2af699..0e06bc0
--- a/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
+++ b/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java
@@@ -61,11 -58,13 +61,14 @@@ public class FileMessageHeade
  private final CompressionMetadata compressionMetadata;
  public final long repairedAt;
  public final int sstableLevel;
 +public 

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8868b744cae5b5b4ef67b7738a117c6e71888235
Parents: b7c3dc5 7bd65a1
Author: Stefania Alborghetti 
Authored: Fri Jul 29 15:28:29 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Jul 29 15:29:09 2016 +0800

--
 CHANGES.txt |  1 +
 bin/cqlsh.py|  2 +-
 .../cassandra/concurrent/StageManager.java  | 18 -
 .../apache/cassandra/tracing/TraceState.java| 41 +++-
 4 files changed, 58 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8868b744/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f6997b,9a16ee3..bb67fc9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,30 @@@
 -2.2.8
 +3.0.9
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
   * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
   * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
   * Synchronize ThriftServer::stop() (CASSANDRA-12105)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8868b744/src/java/org/apache/cassandra/concurrent/StageManager.java
--

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 659be5f5e7845b477707e54b280575b47a42d0e6
Parents: c3bf2f4 b92ab60
Author: Stefania Alborghetti 
Authored: Mon Jul 25 09:23:00 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Jul 25 09:23:00 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/659be5f5/CHANGES.txt
--
diff --cc CHANGES.txt
index 15898df,ebebbdc..e9f41fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -2.2.8
 +3.0.9
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)

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

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: dce4537410d66a3cbd24b2e581737b849e011917
Parents: 0297cbe e8186fe
Author: Stefania Alborghetti 
Authored: Wed Jul 20 09:56:12 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jul 20 09:56:12 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce45374/CHANGES.txt
--
diff --cc CHANGES.txt
index f205e0b,ffd92b5..739c095
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,8 +1,22 @@@
 -2.2.8
 +3.0.9
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)
  Merged from 2.1:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce45374/pylib/cqlshlib/test/test_cqlsh_output.py
--
diff --cc pylib/cqlshlib/test/test_cqlsh_output.py
index f867312,60699f3..85ce626
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@@ -631,9 -630,9 +631,9 @@@ class TestCqlshOutput(BaseTestCase)
  AND memtable_flush_period_in_ms = 0
  AND min_index_interval = 128
  AND read_repair_chance = 0.0
 -AND speculative_retry = '99.0PERCENTILE';
 +AND speculative_retry = '99PERCENTILE';
  
- """ % quote_name(get_test_keyspace()))
+ """ % quote_name(get_keyspace()))
  
  with testrun_cqlsh(tty=True, cqlver=cqlsh.DEFAULT_CQLVER) as c:
  for cmdword in ('describe table', 'desc columnfamily'):

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

[jmckenzie]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e99ee19950e764ca55331d7c814e965bef359a4f
Parents: 5861cd8 f0d1d75
Author: Josh McKenzie 
Authored: Mon Jul 11 16:28:13 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Jul 11 16:28:22 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 4b92f64,4ad798a..09d2094
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -924,21 -858,23 +924,26 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
+ # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+ # This threshold can be adjusted to minimize logging if necessary
+ # gc_log_threshold_in_ms: 200
+ 
  # GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+ # If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+ # INFO level
  # Adjust the threshold based on your application throughput requirement
- # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
 -# gc_warn_threshold_in_ms: 1000
 +gc_warn_threshold_in_ms: 1000
  
  # UDFs (user defined functions) are disabled by default.
 -# As of Cassandra 2.2, there is no security manager or anything else in place 
that
 -# prevents execution of evil code. CASSANDRA-9402 will fix this issue for 
Cassandra 3.0.
 -# This will inherently be backwards-incompatible with any 2.2 UDF that 
perform insecure
 -# operations such as opening a socket or writing to the filesystem.
 +# As of Cassandra 3.0 there is a sandbox in place that should prevent 
execution of evil code.
  enable_user_defined_functions: false
  
 +# Enables scripted UDFs (JavaScript UDFs).
 +# Java UDFs are always enabled, if enable_user_defined_functions is true.
 +# Enable this option to be able to use UDFs with "language javascript" or any 
custom JSR-223 provider.
 +# This option has no effect, if enable_user_defined_functions is false.
 +enable_scripted_user_defined_functions: false
 +
  # The default Windows kernel timer and scheduling resolution is 15.6ms for 
power conservation.
  # Lowering this value on Windows can provide much tighter latency and better 
throughput, however
  # some virtualized environments may see a negative performance impact from 
changing this setting

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index b49e14c,ede4560..2bd23b5
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -265,8 -254,12 +265,9 @@@ public class Confi
  public volatile Long index_summary_capacity_in_mb;
  public volatile int index_summary_resize_interval_in_minutes = 60;
  
+ public int gc_log_threshold_in_ms = 200;
  public int gc_warn_threshold_in_ms = 0;
  
 -private static final CsvPreference 
STANDARD_SURROUNDING_SPACES_NEED_QUOTES = new 
CsvPreference.Builder(CsvPreference.STANDARD_PREFERENCE)
 -  
.surroundingSpacesNeedQuotes(true).build();
 -
  // TTL for different types of trace events.
  public int tracetype_query_ttl = (int) TimeUnit.DAYS.toSeconds(1);
  public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2083e42f,f1acfc4..100bcf4
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1934,51 -1801,16 +1939,56 @@@ public class DatabaseDescripto
  return conf.enable_user_defined_functions;
  }
  
 -public static int getWindowsTimerInterval()
 +public 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5861cd8fe2e5427b791672c6db61d2d43d925646
Parents: 4d7141f 9a8406f
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:55:05 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 15:00:03 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5861cd8f/CHANGES.txt
--
diff --cc CHANGES.txt
index 4241da8,837c3fb..70210a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,17 +1,32 @@@
 -2.2.8
 +3.0.9
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- 2.2.8
-  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
-  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * 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)
  Merged from 2.1:
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2fa44cd88119c24489836e0c0c91fd3eed86ce3c
Parents: a227cc6 e983590
Author: Yuki Morishita 
Authored: Fri Jul 8 19:05:46 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Jul 8 19:05:46 2016 -0500

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

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

[yukim]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: a227cc61c501ff81d5dfeba3f6f9c2f214d19c30
Parents: 76e68e9 f28409b
Author: Yuki Morishita 
Authored: Thu Jul 7 11:00:31 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Jul 7 11:00:31 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a227cc61/CHANGES.txt
--
diff --cc CHANGES.txt
index 20ed6e0,9fef5a2..0e483f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,16 +1,30 @@@
 +3.0.9
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ 2.2.8
+  * 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)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  Merged from 2.1:
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

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

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

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 362e132069dcda15b2edfc872ece552645cfda84
Parents: 1cff5fa 38ed061
Author: Stefania Alborghetti 
Authored: Wed Jun 29 14:04:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jun 29 14:04:45 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/362e1320/CHANGES.txt
--
diff --cc CHANGES.txt
index aaeafd6,48bd5aa..ae37d2c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,15 @@@
 -2.2.8
++3.0.9
++Merged from 2.2:
+  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
+ 
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

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

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

[jmckenzie]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2395f9e4678c76fa288675c57496259515efef90
Parents: 7005972 3a61c10
Author: Josh McKenzie 
Authored: Tue Jun 28 13:47:08 2016 -0400
Committer: Josh McKenzie 
Committed: Tue Jun 28 13:47:24 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2395f9e4/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 794189f,60d15bb..80645f9
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -327,25 -326,6 +327,26 @@@ Function SetCassandraEnvironmen
  # times. If in doubt, and if you do not particularly want to tweak, go
  # 100 MB per physical CPU core.
  
++New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
 +#GC log path has to be defined here since it needs to find CASSANDRA_HOME
 +$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
 +
 +# Read user-defined JVM options from jvm.options file
 +$content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
 +for ($i = 0; $i -lt $content.Count; $i++)
 +{
 +$line = $content[$i]
 +if ($line.StartsWith("-"))
 +{
 +$env:JVM_OPTS = "$env:JVM_OPTS $line"
 +}
 +}
 +
 +$defined_xmn = $env:JVM_OPTS -like '*Xmn*'
 +$defined_xmx = $env:JVM_OPTS -like '*Xmx*'
 +$defined_xms = $env:JVM_OPTS -like '*Xms*'
 +$using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
 +
  #$env:MAX_HEAP_SIZE="4096M"
  #$env:HEAP_NEWSIZE="800M"
  CalculateHeapSizes

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2395f9e4/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 44fe110,5d2330c..568448b
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -121,30 -124,6 +121,31 @@@ case "$jvm" i
  ;;
  esac
  
++mkdir -p ${CASSANDRA_HOME}/logs/
 +#GC log path has to be defined here because it needs to access CASSANDRA_HOME
 +JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
 +
 +# Here we create the arguments that will get passed to the jvm when
 +# starting cassandra.
 +
 +# Read user-defined JVM options from jvm.options file
 +JVM_OPTS_FILE=$CASSANDRA_CONF/jvm.options
 +for opt in `grep "^-" $JVM_OPTS_FILE`
 +do
 +  JVM_OPTS="$JVM_OPTS $opt"
 +done
 +
 +# Check what parameters were defined on jvm.options file to avoid conflicts
 +echo $JVM_OPTS | grep -q Xmn
 +DEFINED_XMN=$?
 +echo $JVM_OPTS | grep -q Xmx
 +DEFINED_XMX=$?
 +echo $JVM_OPTS | grep -q Xms
 +DEFINED_XMS=$?
 +echo $JVM_OPTS | grep -q UseConcMarkSweepGC
 +USING_CMS=$?
 +echo $JVM_OPTS | grep -q UseG1GC
 +USING_G1=$?
  
  # Override these to set the amount of memory to allocate to the JVM at
  # start-up. For production use you may wish to adjust this for your

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

[samt]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 6b994cabe3f9cfc07179726f2a4f7090981d94b2
Parents: bedc742 360541f
Author: Sam Tunnicliffe 
Authored: Fri Jun 3 10:36:51 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Fri Jun 3 10:56:39 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/CHANGES.txt
--
diff --cc CHANGES.txt
index 70da4ad,ce48994..2de1e25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.7
 +3.0.7
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 205df8b,74a3c7b..c5c6abe
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -465,11 -294,10 +465,10 @@@ public final class SystemKeyspac
  
  public static void finishStartup()
  {
- persistLocalMetadata();
 -LegacySchemaTables.saveSystemKeyspaceSchema();
 +SchemaKeyspace.saveSystemKeyspacesSchema();
  }
  
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
  {
  String req = "INSERT INTO system.%s (" +
   "key," +

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

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

[tylerhobbs]

Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/trunk
Commit: 6932bbd909547684469ab5e2ea9e49c2e1005996
Parents: f99f8a8 b8f5c1f
Author: Tyler Hobbs 
Authored: Wed Jun 1 12:39:23 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Jun 1 12:39:23 2016 -0500

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6932bbd9/CHANGES.txt
--
diff --cc CHANGES.txt
index 07845a6,c97293d..a59dff1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.7
 +3.0.7
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
+  * 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)

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