[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/dht/RangeStreamer.java src/java/org/apache/cassandra/repair/StreamingRepairTask.java src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/streaming/SessionInfo.java src/java/org/apache/cassandra/streaming/StreamPlan.java src/java/org/apache/cassandra/streaming/StreamResultFuture.java src/java/org/apache/cassandra/streaming/StreamSession.java src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java src/java/org/apache/cassandra/tools/NodeCmd.java test/unit/org/apache/cassandra/streaming/SessionInfoTest.java test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cca24f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cca24f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cca24f4 Branch: refs/heads/cassandra-2.1 Commit: 6cca24f442a17d2abedfffd4a5322cb61caeef74 Parents: 42f8590 c6867c2 Author: Yuki Morishita Authored: Mon Oct 20 10:21:55 2014 -0500 Committer: Yuki Morishita Committed: Mon Oct 20 10:21:55 2014 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 8 - .../org/apache/cassandra/dht/RangeStreamer.java | 4 ++- .../net/OutboundTcpConnectionPool.java | 12 .../cassandra/repair/StreamingRepairTask.java | 10 +-- .../cassandra/service/StorageService.java | 17 +++ .../apache/cassandra/streaming/SessionInfo.java | 3 ++ .../cassandra/streaming/StreamCoordinator.java | 20 ++--- .../apache/cassandra/streaming/StreamPlan.java | 31 ++-- .../cassandra/streaming/StreamResultFuture.java | 2 +- .../cassandra/streaming/StreamSession.java | 24 +++ .../management/SessionInfoCompositeData.java| 30 +++ .../org/apache/cassandra/tools/NodeTool.java| 8 - .../cassandra/streaming/SessionInfoTest.java| 2 +- .../streaming/StreamTransferTaskTest.java | 4 ++- .../streaming/StreamingTransferTest.java| 2 +- 16 files changed, 119 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cca24f4/CHANGES.txt -- diff --cc CHANGES.txt index 7cd5154,4ed7bed..4e5cd24 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,89 -1,4 +1,90 @@@ -2.0.11: +2.1.1 + * Fix IllegalArgumentException when a list of IN values containing tuples + is passed as a single arg to a prepared statement with the v1 or v2 + protocol (CASSANDRA-8062) + * Fix ClassCastException in DISTINCT query on static columns with + query paging (CASSANDRA-8108) + * Fix NPE on null nested UDT inside a set (CASSANDRA-8105) + * Fix exception when querying secondary index on set items or map keys + when some clustering columns are specified (CASSANDRA-8073) + * Send proper error response when there is an error during native + protocol message decode (CASSANDRA-8118) + * Gossip should ignore generation numbers too far in the future (CASSANDRA-8113) + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104) + * Fix high memory use due to tracking reads on incrementally opened sstable + readers (CASSANDRA-8066) + * Fix EXECUTE request with skipMetadata=false returning no metadata + (CASSANDRA-8054) + * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776) + * Shutdown JVM on OOM (CASSANDRA-7507) + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761) + * Don't duplicate sstables smaller than split size when using + the sstablesplitter tool (CASSANDRA-7616) + * Avoid re-parsing already prepared statements (CASSANDRA-7923) + * Fix some Thrift slice deletions and updates of COMPACT STORAGE + tables with some clustering columns omitted (CASSANDRA-7990) + * Fix filtering for CONTAINS on sets (CASSANDRA-8033) + * Properly track added size (CASSANDRA-7239) + * Allow compilation in java 8 (CASSANDRA-7208) + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) + * Release references to overlapping sstables during compaction (CASSANDRA-7819) + * Send notification when opening compaction results early (CASSANDRA-8034) + * Make native server start block until properly bound (CASSANDRA-7885) + * (cqlsh) Fix IPv6 support (CASSANDRA-7988) + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939) + * Make sstablerepairedset take a list of files (CASSANDRA-7995) + * (cqlsh) Tab completeion for indexes on map keys (CASS
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b2e946f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b2e946f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b2e946f Branch: refs/heads/trunk Commit: 4b2e946f6155874ca79bcce2f96d1e3a985f0d32 Parents: 85014df dc7d5a0 Author: Yuki Morishita Authored: Wed Jul 16 15:59:07 2014 -0500 Committer: Yuki Morishita Committed: Wed Jul 16 15:59:07 2014 -0500 -- --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6298e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6298e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6298e2 Branch: refs/heads/trunk Commit: 9a6298e296915113fcbf9d60dd8a997ace0e077d Parents: 0cdf2b3 f6c5e02 Author: Mikhail Stepura Authored: Fri Jun 20 14:15:40 2014 +1100 Committer: Mikhail Stepura Committed: Fri Jun 20 14:15:40 2014 +1100 -- CHANGES.txt | 1 + .../apache/cassandra/io/util/FastByteArrayOutputStream.java | 7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6298e2/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6298e2/src/java/org/apache/cassandra/io/util/FastByteArrayOutputStream.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: pylib/cqlshlib/formatting.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cdf2b3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cdf2b3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cdf2b3f Branch: refs/heads/trunk Commit: 0cdf2b3fc5bc9a07699e99d21f73f911343ede8e Parents: 6858dd3 37736ab Author: Mikhail Stepura Authored: Fri Jun 20 14:04:29 2014 +1100 Committer: Mikhail Stepura Committed: Fri Jun 20 14:04:29 2014 +1100 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cdf2b3f/CHANGES.txt --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4e09469 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4e09469 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4e09469 Branch: refs/heads/trunk Commit: c4e09469dc149eb3216fc88291704978f16d85c2 Parents: 03f76a9 dd87228 Author: Mikhail Stepura Authored: Thu Jun 19 15:16:41 2014 +1100 Committer: Mikhail Stepura Committed: Thu Jun 19 15:16:41 2014 +1100 -- CHANGES.txt | 1 + bin/cqlsh | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/CHANGES.txt -- diff --cc CHANGES.txt index bd67438,16e0531..fb74327 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,24 +1,26 @@@ -2.0.9 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) +2.1.0 + * Avoid incremental compaction on Windows (CASSANDRA-7365) + * Fix exception when querying a composite-keyed table with a collection index + (CASSANDRA-7372) + * Use node's host id in place of counter ids (CASSANDRA-7366) * Fix native protocol CAS batches (CASSANDRA-7337) + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) + * Don't fail streams on failure detector downs (CASSANDRA-3569) + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) + * Reduce run time for CQL tests (CASSANDRA-7327) + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353) + * RefCount native frames from netty (CASSANDRA-7245) + * Use tarball dir instead of /var for default paths (CASSANDRA-7136) +Merged from 2.0: + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) * Add per-CF range read request latency metrics (CASSANDRA-7338) * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) - * Add authentication support to shuffle (CASSANDRA-6484) - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) - * Reference sstables before populating key cache (CASSANDRA-7234) Merged from 1.2: + * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266) * Errors in FlushRunnable may leave threads hung (CASSANDRA-7275) * reduce failure detector initial value to 2s (CASSANDRA-7307) * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4e09469/bin/cqlsh --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03f76a9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03f76a9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03f76a9c Branch: refs/heads/trunk Commit: 03f76a9ccc874163e8b4f1d2a47a8b5d2713d93f Parents: 197d439 87282f1 Author: Mikhail Stepura Authored: Thu Jun 19 14:56:30 2014 +1100 Committer: Mikhail Stepura Committed: Thu Jun 19 14:56:30 2014 +1100 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f76a9c/CHANGES.txt -- diff --cc CHANGES.txt index 216b0af,28e831b..bd67438 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,24 +1,26 @@@ -2.0.9 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) +2.1.0 + * Avoid incremental compaction on Windows (CASSANDRA-7365) + * Fix exception when querying a composite-keyed table with a collection index + (CASSANDRA-7372) + * Use node's host id in place of counter ids (CASSANDRA-7366) * Fix native protocol CAS batches (CASSANDRA-7337) + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) + * Don't fail streams on failure detector downs (CASSANDRA-3569) + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) + * Reduce run time for CQL tests (CASSANDRA-7327) + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353) + * RefCount native frames from netty (CASSANDRA-7245) + * Use tarball dir instead of /var for default paths (CASSANDRA-7136) +Merged from 2.0: + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) * Add per-CF range read request latency metrics (CASSANDRA-7338) * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) - * Add authentication support to shuffle (CASSANDRA-6484) - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) - * Reference sstables before populating key cache (CASSANDRA-7234) Merged from 1.2: + * Errors in FlushRunnable may leave threads hung (CASSANDRA-7275) * reduce failure detector initial value to 2s (CASSANDRA-7307) * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197d4394 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/197d4394 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/197d4394 Branch: refs/heads/trunk Commit: 197d43941e8139e91e7028b24a50177bf8ea47bd Parents: 423b62c 4c476f7 Author: Brandon Williams Authored: Wed Jun 18 15:24:19 2014 -0500 Committer: Brandon Williams Committed: Wed Jun 18 15:24:19 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/197d4394/CHANGES.txt -- diff --cc CHANGES.txt index 335192b,8aef84d..216b0af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,24 +1,26 @@@ -2.0.9 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) +2.1.0 + * Avoid incremental compaction on Windows (CASSANDRA-7365) + * Fix exception when querying a composite-keyed table with a collection index + (CASSANDRA-7372) + * Use node's host id in place of counter ids (CASSANDRA-7366) * Fix native protocol CAS batches (CASSANDRA-7337) + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) + * Don't fail streams on failure detector downs (CASSANDRA-3569) + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) + * Reduce run time for CQL tests (CASSANDRA-7327) + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353) + * RefCount native frames from netty (CASSANDRA-7245) + * Use tarball dir instead of /var for default paths (CASSANDRA-7136) +Merged from 2.0: + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) * Add per-CF range read request latency metrics (CASSANDRA-7338) * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) - * Add authentication support to shuffle (CASSANDRA-6484) - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) - * Reference sstables before populating key cache (CASSANDRA-7234) Merged from 1.2: + * reduce failure detector initial value to 2s (CASSANDRA-7307) * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268) * Track metrics at a keyspace level (CASSANDRA-6539) http://git-wip-us.apache.org/repos/asf/cassandra/blob/197d4394/src/java/org/apache/cassandra/gms/FailureDetector.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b3d801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b3d801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b3d801 Branch: refs/heads/trunk Commit: b4b3d801233f9e9abc84b882c7ae5ed9589b418e Parents: 6c8271f 3d81ac5 Author: Brandon Williams Authored: Thu Jun 12 14:53:57 2014 -0500 Committer: Brandon Williams Committed: Thu Jun 12 14:53:57 2014 -0500 -- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b3d801/src/java/org/apache/cassandra/gms/FailureDetector.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c8271f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c8271f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c8271f6 Branch: refs/heads/trunk Commit: 6c8271f60a3c3e8a2f1e841542bbb58c9073c140 Parents: c94caec daf6f68 Author: Brandon Williams Authored: Thu Jun 12 14:45:58 2014 -0500 Committer: Brandon Williams Committed: Thu Jun 12 14:45:58 2014 -0500 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 12 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c8271f6/CHANGES.txt -- diff --cc CHANGES.txt index cc968c3,a2a978e..1b320fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,23 +1,25 @@@ -2.0.9 +2.1.0 + * Fix exception when querying a composite-keyed table with a collection index + (CASSANDRA-7372) + * Use node's host id in place of counter ids (CASSANDRA-7366) * Fix native protocol CAS batches (CASSANDRA-7337) + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) + * Don't fail streams on failure detector downs (CASSANDRA-3569) + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) + * Reduce run time for CQL tests (CASSANDRA-7327) + * Fix heap size calculation on Windows (CASSANDRA-7352) + * RefCount native frames from netty (CASSANDRA-7245) + * Use tarball dir instead of /var for default paths (CASSANDRA-7136) +Merged from 2.0: * Add per-CF range read request latency metrics (CASSANDRA-7338) * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) - * Add authentication support to shuffle (CASSANDRA-6484) - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) - * Reference sstables before populating key cache (CASSANDRA-7234) Merged from 1.2: + 1.2.17 + * Add replace_address_first_boot flag to only replace if not bootstrapped (CASSANDRA-7356) * Enable keepalive for native protocol (CASSANDRA-7380) * Check internal addresses for seeds (CASSANDRA-6523) * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c8271f6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9adb31ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9adb31ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9adb31ca Branch: refs/heads/trunk Commit: 9adb31ca9aeb890e7a6492b1d3da0cc64896366f Parents: 60c7c73 0c3424e Author: Brandon Williams Authored: Mon Jun 9 14:18:22 2014 -0500 Committer: Brandon Williams Committed: Mon Jun 9 14:18:22 2014 -0500 -- CHANGES.txt | 1 + .../gms/GossipDigestAckVerbHandler.java | 1 - .../gms/GossipDigestSynVerbHandler.java | 1 - src/java/org/apache/cassandra/gms/Gossiper.java | 25 4 files changed, 16 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adb31ca/CHANGES.txt -- diff --cc CHANGES.txt index 45c2063,ac95e3f..784f9f9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,51 -4,24 +14,52 @@@ Merged from 2.0 * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) Merged from 1.2: + * Check internal addresses for seeds (CASSANDRA-6523) * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354) - * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) - * Fix handling of empty counter replication mutations (CASSANDRA-7144) -2.0.8 +2.1.0-rc1 + * Revert flush directory (CASSANDRA-6357) + * More efficient executor service for fast operations (CASSANDRA-4718) + * Move less common tools into a new cassandra-tools package (CASSANDRA-7160) + * Support more concurrent requests in native protocol (CASSANDRA-7231) + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421) + * Change concurrent_compactors defaults (CASSANDRA-7139) + * Add PowerShell Windows launch scripts (CASSANDRA-7001) + * Make commitlog archive+restore more robust (CASSANDRA-6974) + * Fix marking commitlogsegments clean (CASSANDRA-6959) + * Add snapshot "manifest" describing files included (CASSANDRA-6326) + * Parallel streaming for sstableloader (CASSANDRA-3668) + * Fix bugs in supercolumns handling (CASSANDRA-7138) + * Fix ClassClassException on composite dense tables (CASSANDRA-7112) + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107) + * Upgrade NBHM lib (CASSANDRA-7128) + * Optimize netty server (CASSANDRA-6861) + * Fix repair hang when given CF does not exist (CASSANDRA-7189) + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635) + * Add server side batching to native transport (CASSANDRA-5663) + * Make batchlog replay asynchronous (CASSANDRA-6134) + * remove unused classes (CASSANDRA-7197) + * Limit user types to the keyspace they are defined in (CASSANDRA-6643) + * Add validate method to CollectionType (CASSANDRA-7208) + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261) + * Fix nodetool netstats (CASSANDRA-7270) + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284) + * Use prepared statements internally (CASSANDRA-6975) + * Fix broken paging state with prepared statement (CASSANDRA-7120) + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287) + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206) + * Backport Thrift MultiSliceRequest (CASSANDRA-7027) + * Handle overlapping MultiSlices (CASSANDRA-7279) + * Fix DataOutputTest on Windows (CASSANDRA-7265) + * Embedded sets in user defined data-types are not updating (CASSANDRA-7267) + * Add tuple type to CQL/native protocol (CASSANDRA-7248) + * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322) +Merged from 2.0: + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) * Always reallocate buffers in HSHA (CASSANDRA-6285) * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adb31ca/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adb31ca/src/java/org/apache/cassandra/gms/Gossiper.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbe4df5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe4df5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbe4df5e Branch: refs/heads/trunk Commit: fbe4df5e22fed6ca063509f18053c647cd58537e Parents: 13198c7 500e7b7 Author: Mikhail Stepura Authored: Tue Jun 3 14:16:40 2014 -0700 Committer: Mikhail Stepura Committed: Tue Jun 3 14:16:40 2014 -0700 -- --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cb50583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb50583 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb50583 Branch: refs/heads/trunk Commit: 8cb50583d42e672d4897061cec53345f9f7839a7 Parents: 86b6ec5 81286b0 Author: Brandon Williams Authored: Tue May 27 18:12:34 2014 -0500 Committer: Brandon Williams Committed: Tue May 27 18:12:34 2014 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb50583/src/java/org/apache/cassandra/service/StorageService.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/a0d096b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0d096b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0d096b0 Branch: refs/heads/trunk Commit: a0d096b03639ec0824ed500af82550779e293b1e Parents: 8dab582 51f9e98 Author: Mikhail Stepura Authored: Thu May 8 13:32:40 2014 -0700 Committer: Mikhail Stepura Committed: Thu May 8 13:32:40 2014 -0700 -- CHANGES.txt | 2 +- bin/cqlsh | 4 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d096b0/CHANGES.txt -- diff --cc CHANGES.txt index 057fd34,3f7d68e..2d9ce55 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,74 -26,24 +20,74 @@@ Merged from 1.2 * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) * Add Google Compute Engine snitch (CASSANDRA-7132) - * Fix nodetool display with vnodes (CASSANDRA-7082) - * Fix schema concurrency exceptions (CASSANDRA-6841) - * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps - (CASSANDRA-6822) - * Fix batchlog to account for CF truncation records (CASSANDRA-6999) - * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) - * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) - * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Always clean up references in SerializingCache (CASSANDRA-6994) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) - * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) - * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) * remove duplicate query for local tokens (CASSANDRA-7182) - - * raise streaming phi convict threshold level (CASSANDRA-7063) - * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191) + * exit CQLSH with error status code if script fails (CASSANDRA-6344) -2.0.7 +2.1.0-beta2 + * Increase default CL space to 8GB (CASSANDRA-7031) + * Add range tombstones to read repair digests (CASSANDRA-6863) + * Fix BTree.clear for large updates (CASSANDRA-6943) + * Fail write instead of logging a warning when unable to append to CL + (CASSANDRA-6764) + * Eliminate possibility of CL segment appearing twice in active list + (CASSANDRA-6557) + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759) + * Switch CRC component to Adler and include it for compressed sstables + (CASSANDRA-4165) + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451) + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899) + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897) + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573) + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692) + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660) + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742) + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705) + * Scrub should not always clear out repaired status (CASSANDRA-5351) + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446) + * Fix ClassCastException for compact table with composites (CASSANDRA-6738) + * Fix potentially repairing with wrong nodes (CASSANDRA-6808) + * Change caching option syntax (CASSANDRA-6745) + * Fix stress to do proper counter reads (CASSANDRA-6835) + * Fix help message for stress counter_write (CASSANDRA-6824) + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848) + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849) + * Fix race condition in Batch CLE (CASSANDRA-6860) + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774) + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781) + * Proper compare function for CollectionType (CASSANDRA-6783) + * Update native server to Netty 4 (CASSANDRA-6236) + * Fix off-by-one error in stress (CASSANDRA-6883) + * Make OpOrder AutoCloseable (CASSANDRA-6901) + * Remove sync repair JMX interface (CASSANDRA-6900) + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694) + * Remove adjusted op rate from stress output (CASSANDRA-6921) + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941) + * Serialize batchlog mutations with the version of the target node + (CASSANDRA-6931) + * Optimize CounterColumn#reconcile() (CASSANDRA-6953) + * Properly remove 1.2 sstable support in 2.1
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07dfb58a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07dfb58a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07dfb58a Branch: refs/heads/trunk Commit: 07dfb58adceb23f725a69a0cfa22f19d1b8d1432 Parents: b622411 f524570 Author: Brandon Williams Authored: Mon May 5 14:23:44 2014 -0500 Committer: Brandon Williams Committed: Mon May 5 14:23:44 2014 -0500 -- bin/sstablemetadata.bat | 33 - 1 file changed, 33 deletions(-) --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baee086f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baee086f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baee086f Branch: refs/heads/trunk Commit: baee086f6d2db36d127ea73677c7996209792a03 Parents: 8939ac4 2658c90 Author: Brandon Williams Authored: Fri May 2 16:39:55 2014 -0500 Committer: Brandon Williams Committed: Fri May 2 16:39:55 2014 -0500 -- --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/8939ac49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8939ac49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8939ac49 Branch: refs/heads/trunk Commit: 8939ac49260b65091689c37de94ad65738fc666b Parents: 3089c92 238a020 Author: Brandon Williams Authored: Fri May 2 15:48:09 2014 -0500 Committer: Brandon Williams Committed: Fri May 2 15:48:09 2014 -0500 -- CHANGES.txt | 31 .../cassandra/service/StorageService.java | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8939ac49/CHANGES.txt -- diff --cc CHANGES.txt index 86940ea,9ab1a5f..82b0196 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,72 -1,39 +1,103 @@@ -2.0.8 -=== +2.1.0-rc1 + * Parallel streaming for sstableloader (CASSANDRA-3668) +Merged from 2.0: * Add Google Compute Engine snitch (CASSANDRA-7132) ++Merged from 1.2: ++ * Update system.peers correctly when relocating tokens (CASSANDRA-7126) + +2.1.0-beta2 + * Increase default CL space to 8GB (CASSANDRA-7031) + * Add range tombstones to read repair digests (CASSANDRA-6863) + * Fix BTree.clear for large updates (CASSANDRA-6943) + * Fail write instead of logging a warning when unable to append to CL + (CASSANDRA-6764) + * Eliminate possibility of CL segment appearing twice in active list + (CASSANDRA-6557) + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759) + * Switch CRC component to Adler and include it for compressed sstables + (CASSANDRA-4165) + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451) + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899) + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897) + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573) + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692) + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660) + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742) + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705) + * Scrub should not always clear out repaired status (CASSANDRA-5351) + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446) + * Fix ClassCastException for compact table with composites (CASSANDRA-6738) + * Fix potentially repairing with wrong nodes (CASSANDRA-6808) + * Change caching option syntax (CASSANDRA-6745) + * Fix stress to do proper counter reads (CASSANDRA-6835) + * Fix help message for stress counter_write (CASSANDRA-6824) + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848) + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849) + * Fix race condition in Batch CLE (CASSANDRA-6860) + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774) + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781) + * Proper compare function for CollectionType (CASSANDRA-6783) + * Update native server to Netty 4 (CASSANDRA-6236) + * Fix off-by-one error in stress (CASSANDRA-6883) + * Make OpOrder AutoCloseable (CASSANDRA-6901) + * Remove sync repair JMX interface (CASSANDRA-6900) + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694) + * Remove adjusted op rate from stress output (CASSANDRA-6921) + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941) + * Serialize batchlog mutations with the version of the target node + (CASSANDRA-6931) + * Optimize CounterColumn#reconcile() (CASSANDRA-6953) + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869) + * Lock counter cells, not partitions (CASSANDRA-6880) + * Track presence of legacy counter shards in sstables (CASSANDRA-6888) + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912) + * Add failure handler to async callback (CASSANDRA-6747) + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000) + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924) + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024) + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033) + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919) + * Preemptive opening of compaction result (CASSANDRA-6916) + * Multi-threaded scrub/cleanup/upgradesstables (CASSANDRA-5547) + * Optimize cellname comparison (CASSANDRA-6934) + * Native pro
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ece38643 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece38643 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ece38643 Branch: refs/heads/cassandra-2.1 Commit: ece386439b41144727412d57843bee1be839 Parents: 74e96b4 44a5fc1 Author: Jonathan Ellis Authored: Wed Apr 30 12:50:13 2014 -0500 Committer: Jonathan Ellis Committed: Wed Apr 30 12:50:13 2014 -0500 -- README.asc | 99 ++ README.txt | 102 2 files changed, 99 insertions(+), 102 deletions(-) --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11827f0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11827f0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11827f0d Branch: refs/heads/trunk Commit: 11827f0d7e0d50565f276a7aefe9a88873529ba7 Parents: c073fab 205b661 Author: Brandon Williams Authored: Thu Apr 24 10:22:37 2014 -0500 Committer: Brandon Williams Committed: Thu Apr 24 10:22:37 2014 -0500 -- --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c531f537 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c531f537 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c531f537 Branch: refs/heads/cassandra-2.1 Commit: c531f537fe68610430218904876e30c9ceba21ee Parents: 44f4e79 8b8042b Author: Brandon Williams Authored: Tue Apr 22 09:43:01 2014 -0500 Committer: Brandon Williams Committed: Tue Apr 22 09:43:01 2014 -0500 -- .../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +- .../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c531f537/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/477a0a28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/477a0a28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/477a0a28 Branch: refs/heads/trunk Commit: 477a0a28b5be1c8097c51fefaa77faed2f10e5b0 Parents: 22d86eb 167af2b Author: Mikhail Stepura Authored: Fri Apr 18 18:13:45 2014 -0700 Committer: Mikhail Stepura Committed: Fri Apr 18 18:13:45 2014 -0700 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 24 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/477a0a28/CHANGES.txt -- diff --cc CHANGES.txt index 6533ef4,0605f87..ca88dfd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -108,7 -65,6 +108,8 @@@ Merged from 1.2 * Schedule schema pulls on change (CASSANDRA-6971) * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) + * Fix batchlog to account for CF truncation records (CASSANDRA-6999) ++ * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) 2.0.6 http://git-wip-us.apache.org/repos/asf/cassandra/blob/477a0a28/pylib/cqlshlib/cql3handling.py --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da2acdd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2acdd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da2acdd6 Branch: refs/heads/trunk Commit: da2acdd606fca0952ee74d629a5876cfba58b784 Parents: ffc8dae c17dcd4 Author: Brandon Williams Authored: Tue Apr 8 14:42:43 2014 -0500 Committer: Brandon Williams Committed: Tue Apr 8 14:42:43 2014 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da2acdd6/src/java/org/apache/cassandra/service/StorageService.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffc8dae6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffc8dae6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffc8dae6 Branch: refs/heads/trunk Commit: ffc8dae6d21b4766f15135bac7dccdcf99b630f0 Parents: db3935e a421551 Author: Brandon Williams Authored: Tue Apr 8 14:30:29 2014 -0500 Committer: Brandon Williams Committed: Tue Apr 8 14:30:29 2014 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/service/MigrationManager.java | 12 +++- .../org/apache/cassandra/service/StorageService.java| 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/src/java/org/apache/cassandra/service/MigrationManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/src/java/org/apache/cassandra/service/StorageService.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d71b59e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71b59e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d71b59e6 Branch: refs/heads/trunk Commit: d71b59e67b0a1bc4fb3ed9a106a4b9b84dcb02b7 Parents: 9cd6823 ab99b8e Author: Brandon Williams Authored: Thu Apr 3 17:55:38 2014 -0500 Committer: Brandon Williams Committed: Thu Apr 3 17:55:38 2014 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d71b59e6/src/java/org/apache/cassandra/service/StorageService.java --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4717d276 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4717d276 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4717d276 Branch: refs/heads/trunk Commit: 4717d2769addfaa4bb016bc5f933c602aa110e39 Parents: f3d8ecf 123d5bc Author: Brandon Williams Authored: Thu Apr 3 12:42:44 2014 -0500 Committer: Brandon Williams Committed: Thu Apr 3 12:42:44 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4717d276/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4717d276/src/java/org/apache/cassandra/gms/Gossiper.java -- diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index a7c4f97,f014ac0..2b921cd --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -500,11 -500,13 +500,13 @@@ public class Gossiper implements IFailu tokens = Collections.singletonList(StorageService.getPartitioner().getRandomToken()); } int generation = epState.getHeartBeatState().getGeneration(); -logger.info("Sleeping for " + StorageService.RING_DELAY + "ms to ensure " + endpoint + " does not change"); +logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint); Uninterruptibles.sleepUninterruptibly(StorageService.RING_DELAY, TimeUnit.MILLISECONDS); // make sure it did not change - epState = endpointStateMap.get(endpoint); - if (epState.getHeartBeatState().getGeneration() != generation) + EndpointState newState = endpointStateMap.get(endpoint); + if (newState == null) + logger.warn("Endpoint {} disappeared while trying to assassinate, continuing anyway", endpoint); + else if (newState.getHeartBeatState().getGeneration() != generation) throw new RuntimeException("Endpoint " + endpoint + " generation changed while trying to remove it"); epState.updateTimestamp(); // make sure we don't evict it too soon epState.getHeartBeatState().forceNewerGenerationUnsafe();
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ccee7f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ccee7f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ccee7f5 Branch: refs/heads/trunk Commit: 0ccee7f58cfbccd2f73aca847a32024eb25a338d Parents: e23e57f 91e4d22 Author: Brandon Williams Authored: Wed Mar 19 09:01:05 2014 -0500 Committer: Brandon Williams Committed: Wed Mar 19 09:01:05 2014 -0500 -- debian/cassandra.conf | 2 ++ 1 file changed, 2 insertions(+) --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/ceddff58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ceddff58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ceddff58 Branch: refs/heads/trunk Commit: ceddff58f316b2a04494918615d7240558e5c0d2 Parents: dd60ab4 98ed6a4 Author: Brandon Williams Authored: Mon Mar 17 12:08:10 2014 -0500 Committer: Brandon Williams Committed: Mon Mar 17 12:08:10 2014 -0500 -- CHANGES.txt | 7 +++ conf/cassandra.yaml | 5 +++-- src/java/org/apache/cassandra/config/EncryptionOptions.java | 6 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ceddff58/CHANGES.txt -- diff --cc CHANGES.txt index ca4bcfb,688a759..9682073 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -36,6 -11,14 +36,13 @@@ Merged from 2.0 * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844) * Fix CompactionManager.needsCleanup (CASSANDRA-6845) * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) -Merged from 1.2: + * add extra SSL cipher suites (CASSANDRA-6613) + * fix nodetool getsstables for blob PK (CASSANDRA-6803) + + + 2.0.6 * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) * Pool CqlRecordWriter clients by inetaddress rather than Range (CASSANDRA-6665) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ceddff58/conf/cassandra.yaml --
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/bbad16b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbad16b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbad16b7 Branch: refs/heads/trunk Commit: bbad16b7ee78333f75dc27ea3f3558bbec5c326c Parents: d55e191 fd53628 Author: Brandon Williams Authored: Fri Feb 28 15:15:07 2014 -0600 Committer: Brandon Williams Committed: Fri Feb 28 15:15:07 2014 -0600 -- CHANGES.txt | 1 + conf/cassandra-env.sh | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/CHANGES.txt -- diff --cc CHANGES.txt index 53e1e6f,d6c9ae6..1829683 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -35,46 -27,23 +35,47 @@@ Merged from 2.0 * Optimize single partition batch statements (CASSANDRA-6737) * Disallow post-query re-ordering when paging (CASSANDRA-6722) * Fix potential paging bug with deleted columns (CASSANDRA-6748) -Merged from 1.2: + * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541) * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) - * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) - * Fix partition and range deletes not triggering flush (CASSANDRA-6655) - * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) - * Compact hints after partial replay to clean out tombstones (CASSANDRA-) - * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) - * Don't exchange schema between nodes with different versions (CASSANDRA-6695) - * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) - * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701) - * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711) - * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713) - * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718) - * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631) - * Fix bootstrapping when there is no schema (CASSANDRA-6685) + + +2.1.0-beta1 + * Add flush directory distinct from compaction directories (CASSANDRA-6357) + * Require JNA by default (CASSANDRA-6575) + * add listsnapshots command to nodetool (CASSANDRA-5742) + * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692) + * Multithreaded commitlog (CASSANDRA-3578) + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + * Secondary index support for collections (CASSANDRA-4511, 6383) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine + (CASSANDRA-5417, CASSANDRA-6520) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Add cardinality estimator for key count estimation (CASSANDRA-5906) + * CF id is changed to be non-deterministic. Data dir/key cache are created + uniquely for CF id (CASSANDRA-5202) + * New counters implementation (CASSANDRA-6504) + * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new + ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690) + * Add option to use row cache with a given amount of rows (CASSANDRA-5357) + * Avoid repairing already repaired data (CASSANDRA-5351) + * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649) + * Replace index_interval with min/max_index_interval (CASSANDRA-6379) + * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911) 2.0.5 http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbad16b7/conf/cassandra-env.sh -- diff --cc conf/cassandra-env.sh index 20f2
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0508a155 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0508a155 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0508a155 Branch: refs/heads/trunk Commit: 0508a155e5eec3ec89d02fa0b6a1dd05f86a4f82 Parents: 143372b 50e544f Author: Mikhail Stepura Authored: Fri Feb 21 15:39:59 2014 -0800 Committer: Mikhail Stepura Committed: Fri Feb 21 15:39:59 2014 -0800 -- pylib/cqlshlib/cql3handling.py | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0508a155/pylib/cqlshlib/cql3handling.py -- diff --cc pylib/cqlshlib/cql3handling.py index 093354a,5fe96bb..6c53717 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@@ -1235,31 -1170,3 +1236,31 @@@ class CqlTableDef def __str__(self): return '<%s %s.%s>' % (self.__class__.__name__, self.keyspace, self.name) __repr__ = __str__ + +class UserTypesMeta(object): +_meta = {} + +def __init__(self, meta): +self._meta = meta + +@classmethod +def from_layout(cls, layout): +result = {} +for row in layout: +ksname = row[u'keyspace_name'] +if ksname not in result: +result[ksname] = {} +utname = row[u'type_name'] + +result[ksname][utname] = zip(row[u'column_names'], row[u'column_types']) +return cls(meta=result) + +def get_usertypes_names(self, keyspace): +return map(str, self._meta.get(keyspace, {}).keys()) + +def get_field_names(self, keyspace, type): +return [row[0] for row in self._meta.get(keyspace, {}).get(type, [])] + +def get_fields_with_types(self, ksname, typename): +return [(field[0], lookup_casstype(field[1]).cql_parameterized_type()) for field in - self._meta.get(ksname, {}).get(typename, [])] ++self._meta.get(ksname, {}).get(typename, [])]
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddaddf63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddaddf63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddaddf63 Branch: refs/heads/trunk Commit: ddaddf636c20a3b34a92c06a5f7a64d18e4171eb Parents: ce7bc6a c0ff52e Author: Jonathan Ellis Authored: Wed Feb 19 16:15:18 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 19 16:15:18 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/src/java/org/apache/cassandra/service/StorageService.java --