[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f40f641 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f40f641 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f40f641 Branch: refs/heads/trunk Commit: 4f40f641caaee1e67914dcfc30fd45000e192889 Parents: ece8dca 5a8171c Author: Paulo Motta Authored: Tue Dec 20 12:17:22 2016 -0200 Committer: Paulo Motta Committed: Tue Dec 20 12:17:22 2016 -0200 -- src/java/org/apache/cassandra/db/Keyspace.java | 24 + 1 file changed, 15 insertions(+), 9 deletions(-) --
[4/4] cassandra git commit: Merge branch cassandra-3.X into trunk
Merge branch cassandra-3.X into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83894adf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83894adf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83894adf Branch: refs/heads/trunk Commit: 83894adf15e13f350e7920c86ae421d422139411 Parents: 68b27b8 6f97804 Author: Benjamin Lerer Authored: Fri Dec 16 12:53:37 2016 +0100 Committer: Benjamin Lerer Committed: Fri Dec 16 12:53:37 2016 +0100 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83894adf/CHANGES.txt -- diff --cc CHANGES.txt index 4506324,1563d6b..1b1c1f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,8 -123,9 +133,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68b27b8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68b27b8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68b27b8c Branch: refs/heads/trunk Commit: 68b27b8c4090f6d04dd0b2f24e54f09e99168cf4 Parents: 7d266b9 fcc19a1 Author: Paulo Motta Authored: Thu Dec 15 17:40:55 2016 -0200 Committer: Paulo Motta Committed: Thu Dec 15 17:40:55 2016 -0200 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 21 +++- .../cassandra/service/ActiveRepairService.java | 4 ++-- .../db/compaction/AntiCompactionTest.java | 17 ++-- 4 files changed, 26 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/CHANGES.txt -- diff --cc CHANGES.txt index fd888bc1,6cc177c..4506324 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,8 -123,9 +133,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) * Mark MVs as built after successful bootstrap (CASSANDRA-12984) http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java --
[4/4] cassandra git commit: Merge branch cassandra-3.X into trunk
Merge branch cassandra-3.X into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f67b540 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f67b540 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f67b540 Branch: refs/heads/trunk Commit: 0f67b540e8e2c022348e8c163879d433e8d18fc3 Parents: b88ddb8 e5a77cf Author: Benjamin Lerer Authored: Thu Dec 15 18:14:44 2016 +0100 Committer: Benjamin Lerer Committed: Thu Dec 15 18:14:56 2016 +0100 -- CHANGES.txt | 1 + .../restrictions/StatementRestrictions.java | 11 +++ .../cql3/statements/BatchStatement.java | 11 ++- .../cql3/statements/ModificationStatement.java | 10 ++- .../cql3/validation/operations/BatchTest.java | 40 +++ .../cql3/validation/operations/DeleteTest.java | 57 .../operations/InsertUpdateIfConditionTest.java | 6 ++ .../cql3/validation/operations/UpdateTest.java | 70 8 files changed, 194 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/CHANGES.txt -- diff --cc CHANGES.txt index 9e7dd80,d32d91c..e0c5637 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,8 -123,9 +133,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) * Mark MVs as built after successful bootstrap (CASSANDRA-12984) * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java --
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df84bdf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df84bdf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df84bdf5 Branch: refs/heads/trunk Commit: df84bdf5c3fad20170b21b2a3c7d4507daef93c4 Parents: ac2a0a5 6854191 Author: Dave Brosius Authored: Wed Nov 23 18:39:43 2016 -0500 Committer: Dave Brosius Committed: Wed Nov 23 18:39:43 2016 -0500 -- src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f55d1b9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f55d1b9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f55d1b9f Branch: refs/heads/trunk Commit: f55d1b9f02a0c5b10fd1527440dd2b0371f91fe0 Parents: 732af7d 490c1c2 Author: Pavel Yaskevich Authored: Thu Nov 17 15:27:14 2016 -0800 Committer: Pavel Yaskevich Committed: Thu Nov 17 15:27:14 2016 -0800 -- CHANGES.txt | 1 - .../org/apache/cassandra/db/ColumnIndex.java| 6 +- .../apache/cassandra/index/sasi/KeyFetcher.java | 98 --- .../apache/cassandra/index/sasi/SASIIndex.java | 11 +- .../cassandra/index/sasi/SASIIndexBuilder.java | 13 +- .../cassandra/index/sasi/SSTableIndex.java | 41 ++- .../cassandra/index/sasi/conf/ColumnIndex.java | 4 +- .../index/sasi/conf/view/RangeTermTree.java | 4 - .../sasi/disk/AbstractTokenTreeBuilder.java | 276 -- .../cassandra/index/sasi/disk/Descriptor.java | 33 +-- .../sasi/disk/DynamicTokenTreeBuilder.java | 59 ++-- .../cassandra/index/sasi/disk/KeyOffsets.java | 115 .../cassandra/index/sasi/disk/OnDiskIndex.java | 12 +- .../index/sasi/disk/OnDiskIndexBuilder.java | 16 +- .../index/sasi/disk/PerSSTableIndexWriter.java | 13 +- .../cassandra/index/sasi/disk/RowKey.java | 108 --- .../index/sasi/disk/StaticTokenTreeBuilder.java | 18 +- .../apache/cassandra/index/sasi/disk/Token.java | 9 +- .../cassandra/index/sasi/disk/TokenTree.java| 288 +++ .../index/sasi/disk/TokenTreeBuilder.java | 72 ++--- .../index/sasi/memory/IndexMemtable.java| 8 +- .../index/sasi/memory/KeyRangeIterator.java | 49 ++-- .../cassandra/index/sasi/memory/MemIndex.java | 4 +- .../index/sasi/memory/SkipListMemIndex.java | 12 +- .../index/sasi/memory/TrieMemIndex.java | 45 +-- .../index/sasi/plan/QueryController.java| 49 ++-- .../cassandra/index/sasi/plan/QueryPlan.java| 174 +++ .../io/sstable/format/SSTableFlushObserver.java | 5 - .../io/sstable/format/SSTableReader.java| 33 +-- .../io/sstable/format/big/BigTableWriter.java | 8 +- .../org/apache/cassandra/utils/obs/BitUtil.java | 2 +- test/data/legacy-sasi/on-disk-sa-int2.db| Bin 12312 -> 0 bytes .../cassandra/index/sasi/SASIIndexTest.java | 25 +- .../index/sasi/disk/KeyOffsetsTest.java | 48 .../index/sasi/disk/OnDiskIndexTest.java| 216 +++--- .../sasi/disk/PerSSTableIndexWriterTest.java| 112 ++-- .../index/sasi/disk/TokenTreeTest.java | 208 +++--- .../index/sasi/plan/OperationTest.java | 2 +- .../index/sasi/utils/KeyConverter.java | 69 - .../index/sasi/utils/LongIterator.java | 8 +- .../sasi/utils/RangeUnionIteratorTest.java | 17 -- 41 files changed, 745 insertions(+), 1546 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55d1b9f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55d1b9f/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java --
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea909c8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea909c8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea909c8e Branch: refs/heads/trunk Commit: ea909c8e6998863c1517106bbeb1bb294568b11b Parents: b0fdab4 747a62f Author: Marcus Eriksson Authored: Tue Oct 18 14:21:40 2016 +0200 Committer: Marcus Eriksson Committed: Tue Oct 18 14:21:40 2016 +0200 -- --
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29c5fe69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29c5fe69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29c5fe69 Branch: refs/heads/trunk Commit: 29c5fe69c006c98eede5fd30236c41b0cdf052f4 Parents: 2538013 e930ffa Author: Stefania Alborghetti Authored: Mon Oct 10 09:43:23 2016 +0800 Committer: Stefania Alborghetti Committed: Mon Oct 10 09:43:23 2016 +0800 -- --
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a052dbfe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a052dbfe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a052dbfe Branch: refs/heads/trunk Commit: a052dbfe6fe6d513f3898216ee42325e6ca5e8a4 Parents: 87825f8 0240411 Author: Jeff Jirsa Authored: Thu Sep 29 20:02:31 2016 -0700 Committer: Jeff Jirsa Committed: Thu Sep 29 20:05:38 2016 -0700 -- CHANGES.txt | 3 +-- NEWS.txt| 8 2 files changed, 5 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052dbfe/CHANGES.txt -- diff --cc CHANGES.txt index 727ad64,ca95411..4472411 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,3 +1,6 @@@ +4.0 - ++ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + 3.10 * cdc column addition still breaks schema migration tasks (CASSANDRA-12697) * Upgrade metrics-reporter dependencies (CASSANDRA-12089) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052dbfe/NEWS.txt -- diff --cc NEWS.txt index e1e952b,ad0f2be..9db425a --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,16 -13,6 +13,19 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +4.0 +=== + +New features + + +Upgrading +- - ++- Cassandra will no longer allow invalid keyspace replication options, such as invalid datacenter names for ++ NetworkTopologyStrategy. Operators MUST add new nodes to a datacenter before they can set set ALTER or ++ CREATE keyspace replication policies using that datacenter. Existing keyspaces will continue to operate, ++ but CREATE and ALTER will validate that all datacenters specified exist in the cluster. + 3.10
