You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/02/05 16:37:04 UTC
[1/4] git commit: Update news, version in preparation for 1.2.15
Updated Branches:
refs/heads/cassandra-2.0 41de0bd4e -> 49bb972c6
Update news, version in preparation for 1.2.15
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/178e086f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/178e086f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/178e086f
Branch: refs/heads/cassandra-2.0
Commit: 178e086f1aaa2744dfc8046c9abb0c62e8a65895
Parents: 511787d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 5 08:47:20 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 5 08:47:20 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 10 ++++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/178e086f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75c7104..0989dc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Move handling of migration event source to solve bootstrap race (CASSANDRA-6648)
* Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
+
1.2.14
* Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592)
* add cassandra.default_messaging_version property to allow easier
http://git-wip-us.apache.org/repos/asf/cassandra/blob/178e086f/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 53cb7ca..771536d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,16 @@ restore snapshots created with the previous major version using the
using the provided 'sstableupgrade' tool.
+1.2.15
+======
+
+Upgrading
+---------
+ - This release mainly fix a regression of 1.2.14, namely
+ https://issues.apache.org/jira/browse/CASSANDRA-6648. Users of 1.2.14 are
+ strongly encouraged to upgrade.
+
+
1.2.14
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/178e086f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 150e2fe..ce87a2a 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.14"/>
+ <property name="base.version" value="1.2.15"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/178e086f/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 472063e..bb8ecf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.15) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Wed, 05 Feb 2014 08:42:29 +0100
+
cassandra (1.2.14) unstable; urgency=low
* New release
[4/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
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 <sy...@datastax.com>
Authored: Wed Feb 5 16:36:50 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
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.
[2/4] git commit: Update changes and news file for 2.0.5 re-roll
Posted by sl...@apache.org.
Update changes and news file for 2.0.5 re-roll
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29670eb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29670eb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29670eb6
Branch: refs/heads/cassandra-2.0
Commit: 29670eb6692f239a3e9b0db05f2d5a1b5d4eb8b0
Parents: 41de0bd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 5 09:22:13 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 5 09:22:13 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 14 +++++---------
NEWS.txt | 13 +++----------
2 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29670eb6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7e0a89e..9599e56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,3 @@
-2.0.6
- * Fix direct Memory on architectures that do not support unaligned long access
- (CASSANDRA-6628)
- * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
-Merged from 1.2:
- * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648)
- * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
-
-
2.0.5
* Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
* Add ks.cf names to tombstone logging (CASSANDRA-6597)
@@ -29,6 +20,9 @@ Merged from 1.2:
* Switch stress to use ITransportFactory (CASSANDRA-6641)
* Fix IllegalArgumentException during prepare (CASSANDRA-6592)
* Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517)
+ * Fix direct Memory on architectures that do not support unaligned long access
+ (CASSANDRA-6628)
+ * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
Merged from 1.2:
* fsync compression metadata (CASSANDRA-6531)
* Validate CF existence on execution for prepared statement (CASSANDRA-6535)
@@ -43,6 +37,8 @@ Merged from 1.2:
* Fix preparing with batch and delete from collection (CASSANDRA-6607)
* Fix ABSC reverse iterator's remove() method (CASSANDRA-6629)
* Handle host ID conflicts properly (CASSANDRA-6615)
+ * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648)
+ * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
2.0.4
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29670eb6/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index b21fbaa..b18150f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,16 +14,6 @@ restore snapshots created with the previous major version using the
using the provided 'sstableupgrade' tool.
-2.0.6
-=====
-
-New features
-------------
- - Scrub can now optionally skip corrupt counter partitions. Please note
- that this will lead to the loss of all the counter updates in the skipped
- partition. See the --skip-corrupted option.
-
-
2.0.5
=====
@@ -31,6 +21,9 @@ New features
------------
- Batchlog replay can be, and is throttled by default now.
See batchlog_replay_throttle_in_kb setting in cassandra.yaml.
+ - Scrub can now optionally skip corrupt counter partitions. Please note
+ that this will lead to the loss of all the counter updates in the skipped
+ partition. See the --skip-corrupted option.
Upgrading
---------
[3/4] git commit: Remove/update invalid sentences in CQL doc
Posted by sl...@apache.org.
Remove/update invalid sentences in CQL doc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16efdf4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16efdf4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16efdf4a
Branch: refs/heads/cassandra-2.0
Commit: 16efdf4a0300b2499346156fd4e2a8e0785d2690
Parents: 178e086
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 5 16:32:24 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 5 16:32:24 2014 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16efdf4a/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 8b6cb08..b18ce22 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -275,8 +275,6 @@ CREATE TABLE t (
PRIMARY KEY (k)
)
-Moreover, a table must define at least one column that is not part of the PRIMARY KEY as a row exists in Cassandra only if it contains at least one value for one such column.
-
h4(#createTablepartitionClustering). Partition key and clustering columns
In CQL, the order in which columns are defined for the @PRIMARY KEY@ matters. The first column of the key is called the __partition key__. It has the property that all the rows sharing the same partition key (even across table in fact) are stored on the same physical node. Also, insertion/update/deletion on rows sharing the same partition key for a given table are performed __atomically__ and in __isolation__. Note that it is possible to have a composite partition key, i.e. a partition key formed of multiple columns, using an extra set of parentheses to define which columns forms the partition key.
@@ -445,7 +443,7 @@ INSERT INTO NerdMovies (movie, director, main_actor, year)
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.