[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f6a9f0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f6a9f0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f6a9f0b Branch: refs/heads/trunk Commit: 2f6a9f0bedb0dd7254d771296410e780118f1c7d Parents: c503723 71e83f3 Author: Tyler Hobbs Authored: Fri Dec 4 15:38:40 2015 -0600 Committer: Tyler Hobbs Committed: Fri Dec 4 15:38:40 2015 -0600 -- test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 ++-- test/unit/org/apache/cassandra/cql3/ViewTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4f79aad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4f79aad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4f79aad Branch: refs/heads/trunk Commit: f4f79aad16dd4d2cfe174ca77a2916c0fcc468ec Parents: 9fb436f 5b9f8eb Author: T Jake Luciani Authored: Fri Dec 4 15:57:42 2015 -0500 Committer: T Jake Luciani Committed: Fri Dec 4 15:57:42 2015 -0500 -- --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fb436f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fb436f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fb436f9 Branch: refs/heads/trunk Commit: 9fb436f936d9dc9740273b147c9c4a960638affc Parents: 646da9a ee46dfb Author: T Jake Luciani Authored: Fri Dec 4 15:54:15 2015 -0500 Committer: T Jake Luciani Committed: Fri Dec 4 15:54:15 2015 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/view/ViewUtils.java | 25 ++-- .../apache/cassandra/service/StorageProxy.java | 67 .../apache/cassandra/db/view/ViewUtilsTest.java | 42 ++-- 4 files changed, 88 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb436f9/CHANGES.txt -- diff --cc CHANGES.txt index 9a0e5ce,a2e9434..0511ed4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,6 +1,21 @@@ +3.2 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Avoid MV race during node decommission (CASSANDRA-10674) * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) * Handle single-column deletions correction in materialized views when the column is part of the view primary key (CASSANDRA-10796) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb436f9/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d5eb04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d5eb04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52d5eb04 Branch: refs/heads/trunk Commit: 52d5eb04f625fffa1855f7e7d3e38eff79ea1828 Parents: 220f253 d1a596a Author: Marcus Eriksson Authored: Fri Dec 4 14:27:26 2015 +0100 Committer: Marcus Eriksson Committed: Fri Dec 4 14:27:26 2015 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 10 +--- .../apache/cassandra/db/SystemKeyspaceTest.java | 27 ++-- 3 files changed, 33 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d5eb04/CHANGES.txt -- diff --cc CHANGES.txt index 711bdde,87d2e82..1607a66 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Fix issue with datadir migration on upgrade (CASSANDRA-10788) * Fix bug with range tombstones on reverse queries and test coverage for AbstractBTreePartition (CASSANDRA-10059) * Remove 64k limit on collection elements (CASSANDRA-10374) http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d5eb04/src/java/org/apache/cassandra/db/SystemKeyspace.java --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/220f253f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/220f253f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/220f253f Branch: refs/heads/trunk Commit: 220f253fb30809f55368a30e2594735bc8362718 Parents: 79f4bdb fd5cb43 Author: Sylvain Lebresne Authored: Fri Dec 4 10:10:42 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Dec 4 10:10:42 2015 +0100 -- CHANGES.txt | 2 + .../apache/cassandra/db/RangeTombstoneList.java | 47 +- .../apache/cassandra/utils/SearchIterator.java | 3 +- test/unit/org/apache/cassandra/Util.java| 23 + .../partition/PartitionImplementationTest.java | 524 +++ 5 files changed, 566 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/CHANGES.txt -- diff --cc CHANGES.txt index 08266d3,7a6076b..711bdde --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,7 +1,21 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Fix bug with range tombstones on reverse queries and test coverage for +AbstractBTreePartition (CASSANDRA-10059) * Remove 64k limit on collection elements (CASSANDRA-10374) * Remove unclear Indexer.indexes() method (CASSANDRA-10690) * Fix NPE on stream read error (CASSANDRA-10771) http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/src/java/org/apache/cassandra/db/RangeTombstoneList.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/test/unit/org/apache/cassandra/Util.java --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79f4bdb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79f4bdb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79f4bdb2 Branch: refs/heads/trunk Commit: 79f4bdb20a945f301ce34723ca94863244c4f48a Parents: c19aa15 29c653d Author: Tyler Hobbs Authored: Thu Dec 3 17:30:12 2015 -0600 Committer: Tyler Hobbs Committed: Thu Dec 3 17:30:12 2015 -0600 -- src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c19aa154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c19aa154 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c19aa154 Branch: refs/heads/trunk Commit: c19aa154ae9cbcbad6acb4734d2fc9287d2811dd Parents: 4ca7a8c 2a33c3b Author: Benjamin Lerer Authored: Thu Dec 3 22:57:09 2015 +0100 Committer: Benjamin Lerer Committed: Thu Dec 3 22:57:22 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Lists.java | 13 -- src/java/org/apache/cassandra/cql3/Maps.java| 17 +- src/java/org/apache/cassandra/cql3/Sets.java| 7 - .../validation/entities/CollectionsTest.java| 166 +++ .../entities/FrozenCollectionsTest.java | 98 +++ 6 files changed, 266 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c19aa154/CHANGES.txt -- diff --cc CHANGES.txt index dc811ba,bb8653c..08266d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Remove 64k limit on collection elements (CASSANDRA-10374) * Remove unclear Indexer.indexes() method (CASSANDRA-10690) * Fix NPE on stream read error (CASSANDRA-10771) * Normalize cqlsh DESC output (CASSANDRA-10431)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5845eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5845eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f5845eb Branch: refs/heads/trunk Commit: 4f5845eb5a08b8dd38b02f42d980b50837ba62e8 Parents: 0cb117c b815c78 Author: Sylvain Lebresne Authored: Thu Dec 3 15:02:25 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Dec 3 15:02:25 2015 +0100 -- CHANGES.txt | 1 + NEWS.txt| 3 + src/java/org/apache/cassandra/index/Index.java | 20 +++--- .../cassandra/index/SecondaryIndexManager.java | 65 +--- .../index/internal/CassandraIndex.java | 26 +--- .../org/apache/cassandra/index/StubIndex.java | 6 +- .../index/internal/CustomCassandraIndex.java| 10 ++- 7 files changed, 62 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/CHANGES.txt -- diff --cc CHANGES.txt index 636ebef,f4020a0..e990837 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Remove unclear Indexer.indexes() method (CASSANDRA-10690) * Fix NPE on stream read error (CASSANDRA-10771) * Normalize cqlsh DESC output (CASSANDRA-10431) * Rejects partition range deletions when columns are specified (CASSANDRA-10739) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/NEWS.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/Index.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/SecondaryIndexManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/internal/CassandraIndex.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/test/unit/org/apache/cassandra/index/StubIndex.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/244ba199 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244ba199 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244ba199 Branch: refs/heads/trunk Commit: 244ba19988484b4c68e2c04a9206fce5326ef369 Parents: ca70561 ac60e7d Author: Benjamin Lerer Authored: Wed Dec 2 11:29:22 2015 +0100 Committer: Benjamin Lerer Committed: Wed Dec 2 11:29:47 2015 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/244ba199/CHANGES.txt -- diff --cc CHANGES.txt index 0251b0c,a4a77ad..2f8d1aa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ +3.2 + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Normalize cqlsh DESC output (CASSANDRA-10431) * Rejects partition range deletions when columns are specified (CASSANDRA-10739) * Fix error when saving cached key for old format sstable (CASSANDRA-10778) * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) http://git-wip-us.apache.org/repos/asf/cassandra/blob/244ba199/bin/cqlsh.py --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c3e0b19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c3e0b19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c3e0b19 Branch: refs/heads/trunk Commit: 7c3e0b191f5b535a212866925d57a23e81b063de Parents: c92dab5 60aeef3 Author: Benjamin Lerer Authored: Tue Dec 1 18:15:59 2015 +0100 Committer: Benjamin Lerer Committed: Tue Dec 1 18:16:08 2015 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/DeleteStatement.java| 6 ++ .../cassandra/cql3/validation/operations/DeleteTest.java | 8 3 files changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3e0b19/CHANGES.txt -- diff --cc CHANGES.txt index c91066a,ed66b69..60aaa49 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ +3.2 + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Rejects partition range deletions when columns are specified (CASSANDRA-10739) * Fix error when saving cached key for old format sstable (CASSANDRA-10778) * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) * Fix SELECT statement with IN restrictions on partition key,
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c92dab52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c92dab52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c92dab52 Branch: refs/heads/trunk Commit: c92dab5222d8ae5e1c079a6ade1cb744c9cfadaf Parents: f55df0b 924fb4d Author: T Jake Luciani Authored: Tue Dec 1 11:24:38 2015 -0500 Committer: T Jake Luciani Committed: Tue Dec 1 11:24:38 2015 -0500 -- tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc34dfe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc34dfe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc34dfe Branch: refs/heads/trunk Commit: 2cc34dfef2246d9202eaf12f966c34cc0cd32376 Parents: 19ff0e4 3e53152 Author: Sylvain Lebresne Authored: Tue Dec 1 10:28:25 2015 +0100 Committer: Sylvain Lebresne Committed: Tue Dec 1 10:28:25 2015 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/service/CacheService.java | 4 .../cassandra/io/sstable/LegacySSTableTest.java | 19 ++- 3 files changed, 23 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc34dfe/CHANGES.txt -- diff --cc CHANGES.txt index c69cdf5,99777ec..c91066a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ +3.2 + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Fix error when saving cached key for old format sstable (CASSANDRA-10778) * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) * Fix SELECT statement with IN restrictions on partition key, ORDER BY and LIMIT (CASSANDRA-10729)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d58a50b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d58a50b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d58a50b8 Branch: refs/heads/trunk Commit: d58a50b8ccb897f68e874dd00550146eeb98d2c5 Parents: ea9b360 af089f6 Author: T Jake Luciani Authored: Wed Nov 25 09:04:55 2015 -0500 Committer: T Jake Luciani Committed: Wed Nov 25 09:04:55 2015 -0500 -- CHANGES.txt | 1 + .../cassandra/stress/settings/SettingsMode.java | 22 + .../cassandra/stress/util/JavaDriverClient.java | 26 +--- 3 files changed, 40 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d58a50b8/CHANGES.txt -- diff --cc CHANGES.txt index fa65735,9f6a027..d820343 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,6 +1,17 @@@ +3.2 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + 3.1 Merged from 3.0: + * Improve stress performance over 1k threads (CASSANDRA-7217) * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) * Unable to create a function with argument of type Inet (CASSANDRA-10741) * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bf3002d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bf3002d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bf3002d Branch: refs/heads/trunk Commit: 8bf3002dda0f239bbffdd09645eb42cbf5c1d89e Parents: 958aa7c 8feb66e Author: Aleksey Yeschenko Authored: Tue Nov 24 23:24:58 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 24 23:24:58 2015 + -- CHANGES.txt | 1 + .../cassandra/service/MigrationManager.java | 24 -- .../apache/cassandra/service/MigrationTask.java | 26 .../cassandra/service/StorageService.java | 9 +++ 4 files changed, 53 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf3002d/CHANGES.txt -- diff --cc CHANGES.txt index dd17f11,75922bf..fa65735 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,6 +1,17 @@@ +3.2 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + 3.1 Merged from 3.0: + * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) * Unable to create a function with argument of type Inet (CASSANDRA-10741) * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba144317 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba144317 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba144317 Branch: refs/heads/trunk Commit: ba1443173ff869b4547cab6148eb40cc6255b421 Parents: 2e8bb3a c37dbdb Author: Sylvain Lebresne Authored: Tue Nov 24 14:51:01 2015 +0100 Committer: Sylvain Lebresne Committed: Tue Nov 24 14:51:01 2015 +0100 -- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba144317/test/unit/org/apache/cassandra/service/QueryPagerTest.java --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e8bb3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e8bb3a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e8bb3a6 Branch: refs/heads/trunk Commit: 2e8bb3a6453c423f02825f2496fd54148a14df07 Parents: fa4c173 383eb46 Author: Aleksey Yeschenko Authored: Mon Nov 23 20:24:33 2015 + Committer: Aleksey Yeschenko Committed: Mon Nov 23 20:24:33 2015 + -- .../org/apache/cassandra/schema/KeyspaceParams.java | 5 + .../apache/cassandra/schema/ReplicationParams.java | 15 +++ .../cassandra/schema/LegacySchemaMigratorTest.java | 3 +++ 3 files changed, 23 insertions(+) --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40161607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40161607 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40161607 Branch: refs/heads/trunk Commit: 401616076a422f6b9c8280fc6d245f72ce9ba5ac Parents: bc42f32 f3fcdd7 Author: Sylvain Lebresne Authored: Fri Nov 20 15:21:30 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 20 15:21:30 2015 +0100 -- CHANGES.txt| 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 17 - 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40161607/CHANGES.txt -- diff --cc CHANGES.txt index d9adfc2,6c879a4..8b50fc7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +3.2 + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + 3.1 Merged from 3.0: + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers of single-row deletions (CASSANDRA-10694) * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7d9678b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7d9678b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7d9678b Branch: refs/heads/trunk Commit: e7d9678be22f0839aafe90f511c079ba9b6ab65c Parents: 6771314 7a48a7d Author: Sylvain Lebresne Authored: Fri Nov 20 13:10:51 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 20 13:10:51 2015 +0100 -- build.xml | 64 +- 1 file changed, 1 insertion(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7d9678b/build.xml --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59b26ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59b26ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b59b26ba Branch: refs/heads/trunk Commit: b59b26ba5bf413b02ebde50f005b73cc148c31e2 Parents: 6645062 51a8711 Author: Sylvain Lebresne Authored: Tue Nov 17 11:52:57 2015 +0100 Committer: Sylvain Lebresne Committed: Tue Nov 17 11:52:57 2015 +0100 -- test/unit/org/apache/cassandra/SchemaLoader.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) --
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0010fce6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0010fce6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0010fce6 Branch: refs/heads/trunk Commit: 0010fce6d2c9a811eb66de077b69a83dce29a6ff Parents: 269c5d4 36e7677 Author: Robert Stupp Authored: Mon Nov 16 17:42:42 2015 +0100 Committer: Robert Stupp Committed: Mon Nov 16 17:42:42 2015 +0100 -- tools/stress/src/org/apache/cassandra/stress/StressMetrics.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0010fce6/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java -- diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java index 991edf9,a640058..0190ed8 --- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java @@@ -177,8 -177,6 +177,8 @@@ public class StressMetric public static final String HEADFORMAT = "%-10s%10s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%7s,%9s,%7s,%7s,%8s,%8s,%8s,%8s"; public static final String ROWFORMAT = "%-10s%10d,%8.0f,%8.0f,%8.0f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%7.1f,%9.5f,%7d,%7.0f,%8.0f,%8.0f,%8.0f,%8.0f"; +public static final String[] HEADMETRICS = new String[]{"type", "total ops","op/s","pk/s","row/s","mean","med",".95",".99",".999","max","time","stderr", "errors", "gc: #", "max ms", "sum ms", "sdv ms", "mb"}; - public static final String HEAD = String.format(HEADFORMAT, HEADMETRICS); ++public static final String HEAD = String.format(HEADFORMAT, (Object[]) HEADMETRICS); private static void printHeader(String prefix, PrintStream output) {
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/334fbad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/334fbad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/334fbad7 Branch: refs/heads/trunk Commit: 334fbad7b07d84e9e38cb61d5a1287a981bea964 Parents: d8ad0f0 b3231e9 Author: Tyler Hobbs Authored: Fri Nov 13 15:37:20 2015 -0600 Committer: Tyler Hobbs Committed: Fri Nov 13 15:37:20 2015 -0600 -- CHANGES.txt | 2 + .../cassandra/index/SecondaryIndexManager.java | 6 ++- .../validation/entities/SecondaryIndexTest.java | 55 3 files changed, 61 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/334fbad7/CHANGES.txt -- diff --cc CHANGES.txt index 6ee2beb,9708859..bf65c9b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,13 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Correctly preserve deletion info on updated rows when notifying indexers +of single-row deletions (CASSANDRA-10694) * Notify indexers of partition delete during cleanup (CASSANDRA-10685) * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55811e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55811e56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55811e56 Branch: refs/heads/trunk Commit: 55811e561087da01c365aab74eb576cda11bddd7 Parents: 3820e89 6f7b389 Author: Marcus Eriksson Authored: Wed Nov 11 08:56:12 2015 +0100 Committer: Marcus Eriksson Committed: Wed Nov 11 08:56:12 2015 +0100 -- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableRewriter.java | 5 +--- .../org/apache/cassandra/utils/CLibrary.java| 29 ++-- .../apache/cassandra/utils/CLibraryTest.java| 3 +- 4 files changed, 17 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55811e56/CHANGES.txt -- diff --cc CHANGES.txt index 14b3a3f,5a1e79a..8bed34b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,12 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257) Merged from 2.2: * (Hadoop) fix splits calculation (CASSANDRA-10640)
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce6296be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce6296be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce6296be Branch: refs/heads/trunk Commit: ce6296bea0578116a9b2a78ec8f6b1b96f6cc700 Parents: 3ea35bd ffe48ec Author: Aleksey Yeschenko Authored: Tue Nov 10 15:37:00 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 10 15:37:00 2015 + -- CHANGES.txt | 2 + examples/triggers/README.txt| 41 ++ examples/triggers/conf/AuditTrigger.properties | 19 + examples/triggers/conf/InvertedIndex.properties | 19 - .../apache/cassandra/triggers/AuditTrigger.java | 71 ++ .../cassandra/triggers/InvertedIndex.java | 79 6 files changed, 120 insertions(+), 111 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce6296be/CHANGES.txt -- diff --cc CHANGES.txt index 8c41f50,e0c4e2b..e85022f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 + Merged from 3.0: + * Updated trigger example (CASSANDRA-10257) Merged from 2.2: * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: