[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt NEWS.txt build.xml debian/changelog src/java/org/apache/cassandra/db/BatchlogManager.java src/java/org/apache/cassandra/db/DeletionInfo.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0fce7ace Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fce7ace Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fce7ace Branch: refs/heads/cassandra-2.0 Commit: 0fce7ace02d19a791916b163eec4212579668799 Parents: 07dc6e1 dc3f22b Author: Aleksey Yeschenko Authored: Tue Apr 1 04:22:39 2014 +0300 Committer: Aleksey Yeschenko Committed: Tue Apr 1 04:22:39 2014 +0300 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- test/unit/org/apache/cassandra/db/BatchlogManagerTest.java | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fce7ace/CHANGES.txt -- diff --cc CHANGES.txt index e9dca70,a9a93a4..b4f84e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,89 -1,16 +1,91 @@@ -1.2.17 +2.0.7 + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) +Merged from 1.2: + * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) + * add extra SSL cipher suites (CASSANDRA-6613) + * fix nodetool getsstables for blob PK (CASSANDRA-6803) + * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps +(CASSANDRA-6822) -1.2.16 - * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) - * add extra SSL cipher suites (CASSANDRA-6613) - * fix nodetool getsstables for blob PK (CASSANDRA-6803) +2.0.6 + * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) + * Pool CqlRecordWriter clients by inetaddress rather than Range + (CASSANDRA-6665) + * Fix compaction_history timestamps (CASSANDRA-6784) + * Compare scores of full replica ordering in DES (CASSANDRA-6883) + * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577) + * Allow repairing between specific replicas (CASSANDRA-6440) + * Allow per-dc enabling of hints (CASSANDRA-6157) + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) + * Fix EstimatedHistogram races (CASSANDRA-6682) + * Failure detector correctly converts initial val
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
NEWS.txt
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49bb972c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49bb972c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49bb972c
Branch: refs/heads/cassandra-2.0
Commit: 49bb972c6f79c6717b4750488bdcb035bb770784
Parents: 29670eb 16efdf4
Author: Sylvain Lebresne
Authored: Wed Feb 5 16:36:50 2014 +0100
Committer: Sylvain Lebresne
Committed: Wed Feb 5 16:36:50 2014 +0100
--
doc/cql3/CQL.textile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/49bb972c/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index cf73708,b18ce22..f82fc19
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -459,11 -443,9 +457,11 @@@ INSERT INTO NerdMovies (movie, director
VALUES ('Serenity', 'Joss Whedon', 'Nathan Fillion', 2005)
USING TTL 86400;
- The @INSERT@ statement writes one or more columns for a given row in a table.
Note that since a row is identified by its @PRIMARY KEY@, the columns that
compose it must be specified. Also, since a row only exists when it contains
one value for a column not part of the @PRIMARY KEY@, one such value must be
specified too.
+ The @INSERT@ statement writes one or more columns for a given row in a table.
Note that since a row is identified by its @PRIMARY KEY@, at least the columns
composing it must be specified.
-Note that unlike in SQL, @INSERT@ does not check the prior existence of the
row: the row is created if none existed before, and updated otherwise.
Furthermore, there is no mean to know which of creation or update happened. In
fact, the semantic of @INSERT@ and @UPDATE@ are identical.
+Note that unlike in SQL, @INSERT@ does not check the prior existence of the
row by default: the row is created if none existed before, and updated
otherwise. Furthermore, there is no mean to know which of creation or update
happened.
+
+It is however possible to use the @IF NOT EXISTS@ condition to only insert if
the row does not exist prior to the insertion. But please note that using @IF
NOT EXISTS@ will incur a non negligible performance cost (internally, Paxos
will be used) so this should be used sparingly.
All updates for an @INSERT@ are applied atomically and in isolation.
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/cql3/QueryProcessor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c17189b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c17189b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c17189b Branch: refs/heads/cassandra-2.0 Commit: 9c17189b78f75b33d8c66f236da2d45840c2d30f Parents: b1435ff 9244923 Author: Aleksey Yeschenko Authored: Fri Dec 20 20:16:08 2013 +0300 Committer: Aleksey Yeschenko Committed: Fri Dec 20 20:16:08 2013 +0300 -- --
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/BatchStatement.java src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java src/java/org/apache/cassandra/cql3/statements/SelectStatement.java src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java src/java/org/apache/cassandra/thrift/CassandraServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25471bac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25471bac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25471bac Branch: refs/heads/cassandra-2.0 Commit: 25471bac3527c9fc54c815626f9266d5ea8508da Parents: a7a7ede 0ffa5c2 Author: Sylvain Lebresne Authored: Mon Nov 18 17:30:15 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Nov 18 17:30:15 2013 +0100 -- CHANGES.txt | 2 ++ .../cql3/MeasurableForPreparedCache.java| 26 .../apache/cassandra/cql3/QueryProcessor.java | 9 +-- .../cql3/statements/BatchStatement.java | 12 - .../cql3/statements/ModificationStatement.java | 9 ++- .../cql3/statements/SelectStatement.java| 8 +- .../cassandra/dht/Murmur3Partitioner.java | 9 ++- .../cassandra/thrift/CassandraServer.java | 2 ++ 8 files changed, 71 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25471bac/CHANGES.txt -- diff --cc CHANGES.txt index 57ad75d,d7395a6..7b2db56 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -48,42 -21,11 +48,44 @@@ Merged from 1.2 * Fix AssertionError when doing set element deletion (CASSANDRA-6341) * Make CL code for the native protocol match the one in C* 2.0 (CASSANDRA-6347) + * Disallow altering CQL3 table from thrift (CASSANDRA-6370) + * Fix size computation of prepared statement (CASSANDRA-6369) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION command (CASSANDRA-6228) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/25471bac/src/java/org/apache/cassandra/cql3/MeasurableForPreparedCache.java -- diff --cc src/java/org/apache/cassandra/cql3/Meas
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/322f9a98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322f9a98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322f9a98 Branch: refs/heads/cassandra-2.0 Commit: 322f9a98315aabd8a57b6fe42d5763f9ff6de3a7 Parents: 86b26b6 62e8804 Author: Sylvain Lebresne Authored: Wed Oct 23 16:17:02 2013 +0200 Committer: Sylvain Lebresne Committed: Wed Oct 23 16:17:02 2013 +0200 -- CHANGES.txt | 4 +- .../apache/cassandra/db/RangeTombstoneList.java | 226 --- .../cassandra/db/RangeTombstoneListTest.java| 31 ++- 3 files changed, 125 insertions(+), 136 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/322f9a98/CHANGES.txt -- diff --cc CHANGES.txt index 1df6ade,44eb25d..47e52f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -5,38 -3,10 +5,40 @@@ Merged from 1.2 * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) * add windows bat files for shell commands (CASSANDRA-6145) - + * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) + + -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/322f9a98/src/java/org/apache/cassandra/db/RangeTombstoneList.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfa0e580
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfa0e580
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfa0e580
Branch: refs/heads/cassandra-2.0
Commit: cfa0e580eaa9f30f63bfa185386d405cf805d808
Parents: 16bb898 e983ef1
Author: Dave Brosius
Authored: Fri Oct 18 21:54:16 2013 -0400
Committer: Dave Brosius
Committed: Fri Oct 18 21:54:16 2013 -0400
--
NEWS.txt | 15 ++-
.../org/apache/cassandra/service/StorageService.java | 12 ++--
2 files changed, 16 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfa0e580/NEWS.txt
--
diff --cc NEWS.txt
index 4bffa77,d803f02..9d90ea7
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -14,115 -14,31 +14,120 @@@ restore snapshots created with the prev
using the provided 'sstableupgrade' tool.
-1.2.11
-==
+2.0.2
+=
-Features
-
-- Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE
operations to
- execute only in the local datacenter.
-- New replace_address to supplant the (now removed) replace_token and
- replace_node workflows to replace a dead node in place. Works like the
- old options, but takes the IP address of the node to be replaced.
+New features
+
+- Speculative retry defaults to 99th percentile
+ (See blog post at
http://www.datastax.com/dev/blog/rapid-read-protection-in-cassandra-2-0-2)
+- Configurable metrics reporting
+ (see conf/metrics-reporter-config-sample.yaml)
+- Compaction history and stats are now saved to system keyspace
+ (system.compaction_history table). You can access historiy via
+ new 'nodetool compactionhistory' command or CQL.
- - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE
operations to
- execute only in the local datacenter.
- - New replace_address to supplant the (now removed) replace_token and
- replace_node workflows to replace a dead node in place. Works like the
- old options, but takes the IP address of the node to be replaced.
+2.0.1
+=
Upgrading
-
-- ColumnFamilyMetrics#sstablesPerReadHistogram switched from uniform
sampling
- to biased-to-last-five-minutes sampling.
+- The default memtable allocation has changed from 1/3 of heap to 1/4
+ of heap. Also, default (single-partition) read and write timeouts
+ have been reduced from 10s to 5s and 2s, respectively.
-1.2.10
-==
+2.0.0
+=
Upgrading
-
-- Nothing specific to this release, but please see 1.2.9 if you are
upgrading
- from a previous version.
+- Java 7 is now *required*!
+- Upgrading is ONLY supported from Cassandra 1.2.9 or later. This
+ goes for sstable compatibility as well as network. When
+ upgrading from an earlier release, upgrade to 1.2.9 first and
+ run upgradesstables before proceeding to 2.0.
+- CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
+- Replication and strategy options do not accept unknown options anymore.
+ This was already the case for CQL3 in 1.2 but this is now the case for
+ thrift too.
+- auto_bootstrap of a single-token node with no initial_token will
+ now pick a random token instead of bisecting an existing token
+ range. We recommend upgrading to vnodes; failing that, we
+ recommend specifying initial_token.
+- reduce_cache_sizes_at, reduce_cache_capacity_to, and
+ flush_largest_memtables_at options have been removed from
cassandra.yaml.
+- CacheServiceMBean.reduceCacheSizes() has been removed.
+ Use CacheServiceMBean.set{Key,Row}CacheCapacityInMB() instead.
+- authority option in cassandra.yaml has been deprecated since 1.2.0,
+ but it has been completely removed in 2.0. Please use 'authorizer'
option.
+- ASSUME command has been removed from cqlsh. Use CQL3 blobAsType() and
+ typeAsBlob() conversion functions instead.
+ See https://cassandra.apache.org/doc/cql3/CQL.html#blobFun for details.
+- Inputting blobs as string constants is now fully deprecated in
+ favor of blob constants. Make sure to update your applications to use
+ the new syntax while you are still on 1.2 (which supports both string
+ and blob constants for blob input) before upgrading to 2.0.
+
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3534910 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3534910 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3534910 Branch: refs/heads/cassandra-2.0 Commit: a3534910e1a0bc77dc5739761e695c120f95087c Parents: 14e7895 8c33e72 Author: Sylvain Lebresne Authored: Tue Sep 3 16:36:32 2013 +0200 Committer: Sylvain Lebresne Committed: Tue Sep 3 16:36:32 2013 +0200 -- lib/licenses/netty-3.6.6.txt | 202 ++ 1 file changed, 202 insertions(+) --
