[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/76508213 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76508213 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76508213 Branch: refs/heads/trunk Commit: 76508213df7fe8e22a483b2660ab589c8559cc44 Parents: 2001c25 37c6b2f Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 4 15:05:35 2014 -0400 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 4 15:05:35 2014 -0400 -- .../org/apache/cassandra/config/CFMetaData.java | 21 .../cql3/statements/CreateTableStatement.java | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76508213/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76508213/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/7932119d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7932119d Branch: refs/heads/trunk Commit: 7932119d1c1a300e52e80234a7c66cadc73b9e6a Parents: d01250d 69a25cd Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Aug 28 16:37:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Aug 28 16:37:00 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/6ce04564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce04564 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ce04564 Branch: refs/heads/trunk Commit: 6ce04564227d0ca4bd895797afdc8cba032165bd Parents: a15e11a cb4bc27 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 26 19:17:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 26 19:17:11 2014 +0300 -- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 5 +++ .../org/apache/cassandra/cql3/CQLTester.java| 7 + .../apache/cassandra/cql3/CreateTableTest.java | 32 4 files changed, 45 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/test/unit/org/apache/cassandra/cql3/CQLTester.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/de4ee0bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de4ee0bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de4ee0bb Branch: refs/heads/cassandra-2.1 Commit: de4ee0bbbf451e656cbe6a45e716f33d8bed3aa1 Parents: dac984f baae9b6 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 23 18:27:04 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 23 18:27:04 2014 +0300 -- src/java/org/apache/cassandra/config/CFMetaData.java | 1 + 1 file changed, 1 insertion(+) --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd692ba7 Branch: refs/heads/trunk Commit: bd692ba74499428b0ee5c6defbb86966f3b30c12 Parents: 558bb72 39b8196 Author: Marcus Eriksson marc...@apache.org Authored: Wed Aug 20 08:25:28 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Wed Aug 20 08:25:28 2014 +0200 -- CHANGES.txt | 2 ++ .../compress/CompressedInputStream.java | 17 +-- .../compress/CompressedInputStreamTest.java | 23 +++- 3 files changed, 35 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd692ba7/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/fd40a618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd40a618 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd40a618 Branch: refs/heads/trunk Commit: fd40a6183c3005968c96847e4122ea4690c45c1d Parents: bd692ba c8a8bfc Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 15:51:12 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 15:51:12 2014 +0300 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/8d494c78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d494c78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d494c78 Branch: refs/heads/trunk Commit: 8d494c782dea42f2058a18d63ff27e70f7e64a8f Parents: cc79fe1 d345057 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 20 11:14:13 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 20 11:14:13 2014 -0500 -- CHANGES.txt | 4 ++- .../cassandra/db/marshal/ReversedType.java | 9 + .../org/apache/cassandra/cql3/CQLTester.java| 7 .../org/apache/cassandra/cql3/TypeTest.java | 37 +++- 4 files changed, 55 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d494c78/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/d4ac8d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4ac8d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4ac8d59 Branch: refs/heads/trunk Commit: d4ac8d59b028895daab8b4e549a3d2ffdc033f3e Parents: 69abfaa 579222e Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 19 16:19:54 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 19 16:19:54 2014 +0300 -- CHANGES.txt | 2 +- .../db/index/SecondaryIndexManager.java | 28 +--- 2 files changed, 13 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ac8d59/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ac8d59/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/2ea11c16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ea11c16 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ea11c16 Branch: refs/heads/cassandra-2.1 Commit: 2ea11c1625b1e7658d6502c79996fc0d3a633c91 Parents: 7035cfc e850785 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 18 10:16:12 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 18 10:16:12 2014 +0200 -- CHANGES.txt | 6 ++ .../cassandra/cql3/statements/BatchStatement.java | 3 +++ .../cql3/statements/ModificationStatement.java| 18 -- 3 files changed, 25 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ea11c16/CHANGES.txt -- diff --cc CHANGES.txt index b8132ba,78ef5df..4fa537b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,8 +1,37 @@@ +2.1.1 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0 + Merged from 2.0: + * Properly reject operations on list index with conditions (CASSANDRA-7499) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + 2.1.0-rc6 * Fix OOM issue from netty caching over time (CASSANDRA-7743)
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/5549680e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5549680e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5549680e Branch: refs/heads/trunk Commit: 5549680e7fa8d339e91bef6d1d9b4ba43ea2617a Parents: 5db108c 1f54010 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 18 12:24:11 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 18 12:24:11 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 42 ++-- .../cql3/statements/CreateTableStatement.java | 9 - 3 files changed, 39 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5549680e/CHANGES.txt -- diff --cc CHANGES.txt index cecf153,f1edef4..2e6b184 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,6 +1,36 @@@ +2.1.1 + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + 2.1.0 Merged from 2.0: + * Fix dropping collection when it's the last regular column (CASSANDRA-7744) * Properly reject operations on list index with conditions (CASSANDRA-7499) * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/54fbb0ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54fbb0ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54fbb0ab Branch: refs/heads/trunk Commit: 54fbb0abb917e5717bfe8332560dd3a9663cf60a Parents: 04a1fc6 e9d0214 Author: Jake Luciani j...@apache.org Authored: Fri Aug 15 13:28:35 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 15 13:28:35 2014 -0400 -- CHANGES.txt | 1 + .../cassandra/io/util/RandomAccessReader.java | 5 +- .../io/util/BufferedRandomAccessFileTest.java | 70 3 files changed, 75 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54fbb0ab/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/8a69ef89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a69ef89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a69ef89 Branch: refs/heads/trunk Commit: 8a69ef89892f2a7ffb4f9e67c48d0d8c1ea893b4 Parents: ff9c631 c01df31 Author: Benedict Elliott Smith bened...@apache.org Authored: Sat Aug 16 12:17:17 2014 +0700 Committer: Benedict Elliott Smith bened...@apache.org Committed: Sat Aug 16 12:17:17 2014 +0700 -- CHANGES.txt | 5 ++ .../cassandra/streaming/StreamTransferTask.java | 83 .../streaming/StreamTransferTaskTest.java | 17 +++- 3 files changed, 67 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a69ef89/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a69ef89/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/1040b520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1040b520 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1040b520 Branch: refs/heads/trunk Commit: 1040b520d116abb089acfa24d30aba8556f91f0e Parents: 74e7f28 e4e56c2 Author: Jake Luciani j...@apache.org Authored: Thu Aug 14 09:53:38 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Thu Aug 14 09:53:38 2014 -0400 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/RangeStreamer.java | 11 ++- 2 files changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1040b520/CHANGES.txt -- diff --cc CHANGES.txt index f34cec7,058681a..cf2f34a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,5 +1,28 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) * Add tracing entries about concurrent range requests (CASSANDRA-7599) * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/6a7235e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7235e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a7235e9 Branch: refs/heads/trunk Commit: 6a7235e9e24e999130e1c2f411dcd91ea1b70760 Parents: 55ce317 0623ea8 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 13 11:34:54 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 13 11:34:54 2014 -0500 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/25c335f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c335f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25c335f7 Branch: refs/heads/trunk Commit: 25c335f7372d9d9527552ae7c9f4f421d0fafc8b Parents: 54c6e66 bb55843 Author: Jake Luciani j...@apache.org Authored: Tue Aug 12 10:27:17 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Aug 12 10:27:17 2014 -0400 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/3060ccc9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3060ccc9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3060ccc9 Branch: refs/heads/trunk Commit: 3060ccc9a2f849c9b5525d382d5fad9c6439bbc7 Parents: d71c8aa fbe7b90 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 12 18:20:41 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 12 18:20:41 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3060ccc9/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3060ccc9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/d9b463ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9b463ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9b463ef
Branch: refs/heads/trunk
Commit: d9b463ef529cf697203278e3029ad8f0b38acdcd
Parents: 17193da 2db047b
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 12 15:18:56 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 12 15:18:56 2014 -0500
--
CHANGES.txt| 1 +
pylib/cqlshlib/test/test_cqlsh_output.py | 110 ++--
pylib/cqlshlib/test/test_keyspace_init.cql | 28 ++
3 files changed, 33 insertions(+), 106 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9b463ef/CHANGES.txt
--
diff --cc CHANGES.txt
index c2dc249,be91bbc..050d274
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,3 +1,25 @@@
+2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of
partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
++ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
2.1.0-rc6
* Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
* Add tracing entries about concurrent range requests (CASSANDRA-7599)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9b463ef/pylib/cqlshlib/test/test_cqlsh_output.py
--
diff --cc pylib/cqlshlib/test/test_cqlsh_output.py
index 4f1627e,6fb4f41..baf72c1
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@@ -21,7 -21,7 +21,7 @@@ from __future__ import with_statemen
import re
from itertools import izip
--from .basecase import (BaseTestCase, cqlshlog, dedent, at_a_time, cql, cqlsh,
++from .basecase import (BaseTestCase, cqlshlog, dedent, at_a_time, cqlsh,
TEST_HOST, TEST_PORT)
from .cassconnect import (get_test_keyspace, testrun_cqlsh, testcall_cqlsh,
cassandra_cursor, split_cql_commands, quote_name)
@@@ -31,7 -31,7 +31,9 @@@ from .ansi_colors import (ColoredText,
CONTROL_C = '\x03'
CONTROL_D = '\x04'
++
class TestCqlshOutput(BaseTestCase):
++
def setUp(self):
pass
@@@ -93,33 -93,33 +95,28 @@@
with testrun_cqlsh(tty=True, env={'TERM': termname}) as c:
c.send('select * from has_all_types;\n')
self.assertNoHasColors(c.read_to_next_prompt())
--c.send('select * from has_value_encoding_errors;\n')
--self.assertNoHasColors(c.read_to_next_prompt())
c.send('select count(*) from has_all_types;\n')
self.assertNoHasColors(c.read_to_next_prompt())
c.send('totally invalid cql;\n')
self.assertNoHasColors(c.read_to_next_prompt())
def test_no_prompt_or_colors_output(self):
--# CQL queries and number of lines expected in output:
--queries = (('select * from has_all_types limit 1;', 7),
-- ('select * from has_value_encoding_errors limit 1;', 8))
for termname in ('', 'dumb', 'vt100', 'xterm'):
cqlshlog.debug('TERM=%r' % termname)
--for cql, lines_expected in queries:
--output, result = testcall_cqlsh(prompt=None, env={'TERM':
termname},
--tty=False, input=cql + '\n')
--output = output.splitlines()
--for line in output:
--
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/50ee3a70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50ee3a70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50ee3a70 Branch: refs/heads/trunk Commit: 50ee3a707935408ab31fdcf76302992569eafc15 Parents: 1fee615 4c387e4 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 11 17:33:09 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 11 17:33:09 2014 +0300 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/334969fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/334969fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/334969fd Branch: refs/heads/trunk Commit: 334969fddadcb84945b0d7ecbc85c07c0defb950 Parents: 0c6078a abd1bae Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 12 00:17:49 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 12 00:17:49 2014 +0300 -- test/system/__init__.py | 184 --- test/system/test_thrift_server.py | 2079 2 files changed, 2263 deletions(-) --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/tools/SSTableExport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddda5414
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddda5414
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddda5414
Branch: refs/heads/trunk
Commit: ddda54145e1c8dc77a105c5ef5d87645ed321fb8
Parents: 78b734e eea547c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 7 16:22:36 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 7 16:22:36 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/tools/SSTableExport.java | 132 ++-
2 files changed, 74 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddda5414/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddda5414/src/java/org/apache/cassandra/tools/SSTableExport.java
--
diff --cc src/java/org/apache/cassandra/tools/SSTableExport.java
index c4d693c,3572296..fca1384
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@@ -226,20 -228,26 +226,26 @@@ public class SSTableExpor
throws IOException
{
KeyIterator iter = new KeyIterator(desc);
- DecoratedKey lastKey = null;
- while (iter.hasNext())
+ try
{
- DecoratedKey key = iter.next();
-
- // validate order of the keys in the sstable
- if (lastKey != null lastKey.compareTo(key) 0)
- throw new IOException(Key out of order! + lastKey +
+ key);
- lastKey = key;
-
- outs.println(metadata.getKeyValidator().getString(key.getKey()));
- checkStream(outs); // flushes
+ DecoratedKey lastKey = null;
+ while (iter.hasNext())
+ {
+ DecoratedKey key = iter.next();
+
+ // validate order of the keys in the sstable
+ if (lastKey != null lastKey.compareTo(key) 0)
+ throw new IOException(Key out of order! + lastKey +
+ key);
+ lastKey = key;
+
-outs.println(bytesToHex(key.getKey()));
++
outs.println(metadata.getKeyValidator().getString(key.getKey()));
+ checkStream(outs); // flushes
+ }
+ }
+ finally
+ {
+ iter.close();
}
- iter.close();
}
/**
@@@ -256,47 -263,53 +262,52 @@@
{
SSTableReader sstable = SSTableReader.open(desc);
RandomAccessReader dfile = sstable.openDataReader();
+ try
+ {
+ IPartitioner? partitioner = sstable.partitioner;
- IPartitioner? partitioner = sstable.partitioner;
-
- if (excludes != null)
- toExport.removeAll(Arrays.asList(excludes));
+ if (excludes != null)
+ toExport.removeAll(Arrays.asList(excludes));
- outs.println([);
+ outs.println([);
- int i = 0;
+ int i = 0;
- // last key to compare order
- DecoratedKey lastKey = null;
+ // last key to compare order
+ DecoratedKey lastKey = null;
- for (String key : toExport)
- {
- DecoratedKey decoratedKey =
partitioner.decorateKey(metadata.getKeyValidator().fromString(key));
+ for (String key : toExport)
+ {
-DecoratedKey decoratedKey =
partitioner.decorateKey(hexToBytes(key));
-
++DecoratedKey decoratedKey =
partitioner.decorateKey(metadata.getKeyValidator().fromString(key));
+ if (lastKey != null lastKey.compareTo(decoratedKey) 0)
+ throw new IOException(Key out of order! + lastKey +
+ decoratedKey);
- if (lastKey != null lastKey.compareTo(decoratedKey) 0)
- throw new IOException(Key out of order! + lastKey +
+ decoratedKey);
+ lastKey = decoratedKey;
- lastKey = decoratedKey;
+ RowIndexEntry entry = sstable.getPosition(decoratedKey,
SSTableReader.Operator.EQ);
+ if (entry == null)
+ continue;
- RowIndexEntry entry = sstable.getPosition(decoratedKey,
SSTableReader.Operator.EQ);
- if (entry == null)
- continue;
+ dfile.seek(entry.position);
+
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/e6602f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6602f76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6602f76 Branch: refs/heads/trunk Commit: e6602f76391d13b5966b75e7751a58a8382fa375 Parents: 1c1a40e 95d289b Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 5 10:22:07 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 5 10:22:07 2014 +0200 -- CHANGES.txt | 1 + build.xml| 2 +- .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java| 8 3 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6602f76/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6602f76/build.xml -- diff --cc build.xml index d812555,f1014fb..5271869 --- a/build.xml +++ b/build.xml @@@ -399,9 -400,8 +399,9 @@@ dependency groupId=io.netty artifactId=netty-all version=4.0.20.Final / dependency groupId=com.google.code.findbugs artifactId=jsr305 version=2.0.2 / dependency groupId=com.clearspring.analytics artifactId=stream version=2.5.2 / - dependency groupId=com.datastax.cassandra artifactId=cassandra-driver-core version=2.0.1 / + dependency groupId=com.datastax.cassandra artifactId=cassandra-driver-core version=2.0.4 / dependency groupId=net.sf.supercsv artifactId=super-csv version=2.1.0 / +dependency groupId=net.ju-n.compile-command-annotations artifactId=compile-command-annotations version=1.2.0 / /dependencyManagement developer id=alakshman name=Avinash Lakshman/ developer id=antelder name=Anthony Elder/ http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6602f76/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/077d3ce7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/077d3ce7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/077d3ce7 Branch: refs/heads/trunk Commit: 077d3ce7c7ea0ef3ec4278d9169105545c0a039a Parents: 729d0b8 5f4cd8a Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 4 21:23:21 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 4 21:23:21 2014 +0300 -- CHANGES.txt | 55 --- 1 file changed, 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/077d3ce7/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d06dd10 Branch: refs/heads/trunk Commit: 8d06dd102dd3b119cd1f74a88813c4e6c72e453d Parents: 6b34d46 57abab1 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Aug 3 00:39:59 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Aug 3 00:39:59 2014 -0400 -- build.xml | 2 +- debian/changelog | 6 ++ .../apache/cassandra/thrift/CassandraServer.java | 7 ++- .../cassandra/cql3/StaticColumnsQueryTest.java | 17 + 4 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/build.xml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d06dd10/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/5f0413be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f0413be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f0413be Branch: refs/heads/trunk Commit: 5f0413bef546b3489525709cececd1947be34b67 Parents: 169b1cf 18ce8c7 Author: Jake Luciani j...@apache.org Authored: Fri Aug 1 11:17:23 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 1 11:17:23 2014 -0400 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 5 +++ .../apache/cassandra/db/ColumnFamilyStore.java | 23 +++--- test/conf/cassandra.yaml| 1 + .../org/apache/cassandra/db/CommitLogTest.java | 32 5 files changed, 44 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f0413be/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f0413be/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f0413be/test/conf/cassandra.yaml --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63407db7 Branch: refs/heads/trunk Commit: 63407db7e946bbf5aa796367375fd9cb46ba36c4 Parents: 40d7bdf ef099c3 Author: Marcus Eriksson marc...@apache.org Authored: Thu Jul 31 08:00:30 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Jul 31 08:00:30 2014 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 23 2 files changed, 15 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63407db7/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/93942bad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93942bad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93942bad Branch: refs/heads/trunk Commit: 93942bad00634ddcfa73c97a67190e63a5e63c14 Parents: da1f2db 85bcd2d Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 31 15:42:23 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 31 15:42:23 2014 -0500 -- test/unit/org/apache/cassandra/service/MoveTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/8d6b7326
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d6b7326
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d6b7326
Branch: refs/heads/trunk
Commit: 8d6b732684ae24731e41250f62c1f0d262d06bb3
Parents: 6554bcc 948ae01
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jul 30 15:59:27 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jul 30 15:59:27 2014 -0500
--
CHANGES.txt | 2 ++
bin/cqlsh | 19 ++---
conf/cqlshrc.sample | 3 ++
pylib/cqlshlib/tracing.py | 29 ++--
.../cassandra/net/OutboundTcpConnection.java| 2 +-
.../apache/cassandra/tracing/TraceState.java| 22 +++
.../org/apache/cassandra/tracing/Tracing.java | 7 +++--
7 files changed, 68 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d6b7326/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d6b7326/bin/cqlsh
--
diff --cc bin/cqlsh
index 1b682f0,ba0c886..00e46b5
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -491,9 -492,9 +492,10 @@@ class Shell(cmd.Cmd)
tracing_enabled=False, expand_enabled=False,
display_time_format=DEFAULT_TIME_FORMAT,
display_float_precision=DEFAULT_FLOAT_PRECISION,
+ max_trace_wait=DEFAULT_MAX_TRACE_WAIT,
ssl=False,
- single_statement=None):
+ single_statement=None,
+ client_timeout=10):
cmd.Cmd.__init__(self, completekey=completekey)
self.hostname = hostname
self.port = port
@@@ -1921,9 -1905,9 +1931,10 @@@ def main(options, hostname, port)
keyspace=options.keyspace,
display_time_format=options.time_format,
display_float_precision=options.float_precision,
+ max_trace_wait=options.max_trace_wait,
ssl=options.ssl,
- single_statement=options.execute)
+ single_statement=options.execute,
+ client_timeout=options.client_timeout)
except KeyboardInterrupt:
sys.exit('Connection aborted.')
except CQL_ERRORS, e:
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/db962390 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db962390 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db962390 Branch: refs/heads/trunk Commit: db962390482f8763d794ec0ba7582e470f5b0201 Parents: 2236afb 65a4f5d Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jul 29 19:31:22 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jul 29 19:31:22 2014 +0300 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/ee180495 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee180495 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee180495 Branch: refs/heads/trunk Commit: ee18049587e0543b5d36e62a04c6933851a1f274 Parents: f73a929 72676dd Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 24 17:42:10 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 24 17:42:10 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee180495/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/8081c54c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8081c54c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8081c54c Branch: refs/heads/cassandra-2.1 Commit: 8081c54c2aa5840ab37ed01d6cd8b5bcae22b52b Parents: ee18049 17b26a2 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 24 18:00:25 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 24 18:00:25 2014 -0500 -- --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/e0b88878 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0b88878 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0b88878 Branch: refs/heads/trunk Commit: e0b88878c52b6692d2391b398372d5f5f2a83aff Parents: f9af6ab e740c29 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Jul 22 12:06:11 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Jul 22 12:06:11 2014 -0500 -- doc/cql/CQL.textile | 2 ++ 1 file changed, 2 insertions(+) --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/89842578 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89842578 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89842578 Branch: refs/heads/trunk Commit: 898425783f9ce0222cf49131e3f8204be0a212fb Parents: b9d2684 ce46d66 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Jul 9 18:23:02 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Jul 9 18:23:02 2014 +0200 -- CHANGES.txt | 2 + .../cql3/statements/SelectStatement.java| 17 +- .../cassandra/cql3/StaticColumnsQueryTest.java | 263 +++ 3 files changed, 277 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89842578/CHANGES.txt --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/04944f0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04944f0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04944f0c Branch: refs/heads/trunk Commit: 04944f0ca990254aa51ee5f3791717db15437a89 Parents: ec38458 0bc9841 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jul 8 20:17:36 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jul 8 20:18:24 2014 +0300 -- .rat-excludes | 2 ++ CHANGES.txt | 2 +- build.xml | 2 +- debian/changelog| 6 .../apache/cassandra/db/BufferExpiringCell.java | 4 +-- .../apache/cassandra/db/NativeExpiringCell.java | 4 +-- .../AbstractSimplePerColumnSecondaryIndex.java | 5 ++-- .../db/index/SecondaryIndexManager.java | 31 ++-- test/unit/org/apache/cassandra/db/CellTest.java | 21 + .../stress/generate/DistributionInverted.java | 21 + .../cassandra/stress/generate/Partition.java| 21 + .../stress/generate/PartitionGenerator.java | 21 + .../stress/generate/RatioDistribution.java | 21 + .../apache/cassandra/stress/generate/Row.java | 21 + .../stress/generate/SeedGenerator.java | 21 + .../stress/generate/SeedRandomGenerator.java| 21 + .../stress/generate/SeedSeriesGenerator.java| 21 + .../stress/generate/values/Generator.java | 21 + .../stress/operations/FixedOpDistribution.java | 21 + .../stress/operations/OpDistribution.java | 21 + .../operations/OpDistributionFactory.java | 21 + .../operations/SampledOpDistribution.java | 21 + .../SampledOpDistributionFactory.java | 21 + .../operations/userdefined/SchemaInsert.java| 21 + .../operations/userdefined/SchemaQuery.java | 21 + .../operations/userdefined/SchemaStatement.java | 21 + .../stress/settings/OptionAnyProbabilities.java | 21 + .../settings/OptionEnumProbabilities.java | 21 + .../stress/settings/ValidationType.java | 21 + 29 files changed, 474 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04944f0c/CHANGES.txt -- diff --cc CHANGES.txt index a64eca3,641326e..6421b6f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,3 +1,10 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + ++ 2.1.0-rc3 * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403) * Introduce CQL support for stress tool (CASSANDRA-6146) http://git-wip-us.apache.org/repos/asf/cassandra/blob/04944f0c/build.xml --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/59a8504c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a8504c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59a8504c Branch: refs/heads/trunk Commit: 59a8504c34b361e88ed10964c150272edcc91ff5 Parents: 0b54c4e 8d87e0e Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Jul 7 18:06:04 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Jul 7 18:06:04 2014 +0200 -- CHANGES.txt | 4 +- .../org/apache/cassandra/cql3/Constants.java| 8 +- .../org/apache/cassandra/cql3/UserTypes.java| 11 ++ .../cassandra/cql3/VariableSpecifications.java | 6 ++ .../cql3/statements/SelectStatement.java| 1 + .../org/apache/cassandra/transport/Message.java | 51 + .../org/apache/cassandra/cql3/CQLTester.java| 82 -- .../cassandra/cql3/ContainsRelationTest.java| 106 +++ .../apache/cassandra/cql3/UserTypesTest.java| 33 ++ 9 files changed, 227 insertions(+), 75 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a8504c/CHANGES.txt -- diff --cc CHANGES.txt index b93005e,491ad6d..682f599 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,4 +1,10 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + - 2.1.0 + 2.1.0-rc3 * Fix ClassCastException processing expired messages (CASSANDRA-7496) * Fix prepared marker for collections inside UDT (CASSANDRA-7472) * Remove left-over populate_io_cache_on_flush and replicate_on_write
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/a0bfdebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0bfdebc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0bfdebc Branch: refs/heads/trunk Commit: a0bfdebcaae6056440961b7d1c6b1efefa911e4f Parents: 047c67e 8c4ffbe Author: Marcus Eriksson marc...@apache.org Authored: Thu Jul 3 14:29:45 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Jul 3 14:29:45 2014 +0200 -- CHANGES.txt | 1 + NEWS.txt| 9 + .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 + .../org/apache/cassandra/db/compaction/LeveledManifest.java | 5 - 4 files changed, 19 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0bfdebc/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0bfdebc/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/27747583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27747583 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27747583 Branch: refs/heads/trunk Commit: 277475837f0906e6091b2e798afc4e7610846ed1 Parents: ba3a1ba 39925d2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Jul 1 15:40:20 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Jul 1 15:40:20 2014 +0200 -- build.xml | 45 - 1 file changed, 40 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27747583/build.xml --
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.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/d677e790 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d677e790 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d677e790 Branch: refs/heads/trunk Commit: d677e790d220ce4249d394bf87cd0bd7479ba7cc Parents: d213326 0bbfabb Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Jun 30 16:47:48 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Jun 30 16:47:48 2014 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d677e790/CHANGES.txt -- diff --cc CHANGES.txt index c912094,46e7475..5b6b4eb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -17,8 -11,9 +17,10 @@@ Merged from 2.0 * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) * Commit disk failure policy (CASSANDRA-7429) * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns +(CASSANDRA-7455) + 2.1.0-rc2 * Fix heap size calculation for CompoundSparseCellName and CompoundSparseCellName.WithCollection (CASSANDRA-7421)
