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/01/31 13:25:55 UTC
[1/3] git commit: Update versions and licenses for 1.2.14 release
Updated Branches:
refs/heads/cassandra-2.0 1141cdb0c -> 9d70cf3b9
Update versions and licenses for 1.2.14 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a931440
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a931440
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a931440
Branch: refs/heads/cassandra-2.0
Commit: 6a9314408cbd69ce26c2ba04bf49df7809a911bf
Parents: 6ad995e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 10:45:03 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 10:45:03 2014 +0100
----------------------------------------------------------------------
.rat-excludes | 1 +
build.xml | 2 +-
debian/changelog | 6 ++++++
.../apache/cassandra/db/BatchlogManagerTest.java | 17 +++++++++++++++++
4 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index f7f9637..112aec0 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -32,3 +32,4 @@ test/data/legacy-sstables/**
examples/pig/**
examples/hadoop_word_count/conf/log4j.properties
pylib/cqlshlib/test/**
+src/resources/org/apache/cassandra/config/version.properties
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 23f8c71..2a6c524 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.13"/>
+ <property name="base.version" value="1.2.14"/>
<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/6a931440/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index b419cb7..472063e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.14) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 31 Jan 2014 10:29:13 +0100
+
cassandra (1.2.13) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
index 637815b..08728fc 100644
--- a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.db;
import java.net.InetAddress;
[3/3] 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:
.rat-excludes
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/9d70cf3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d70cf3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d70cf3b
Branch: refs/heads/cassandra-2.0
Commit: 9d70cf3b90e703865b4015bb19d171349953d5c7
Parents: 1141cdb 4cb045a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 13:25:45 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 13:25:45 2014 +0100
----------------------------------------------------------------------
.rat-excludes | 2 +-
doc/cql3/CQL.textile | 10 +++++-----
.../apache/cassandra/db/BatchlogManagerTest.java | 17 +++++++++++++++++
3 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/.rat-excludes
----------------------------------------------------------------------
diff --cc .rat-excludes
index cf618c0,112aec0..871f5df
--- a/.rat-excludes
+++ b/.rat-excludes
@@@ -20,12 -18,18 +20,12 @@@ lib/licenses/*.tx
.externalToolBuilders/**
test/data/serialization/*/*
**/*.wpr
-conf/schema-sample.txt
-drivers/txpy/txcql/cassandra/*
-drivers/py/cql/cassandra/*
doc/**
build.properties.default
-test/data/legacy-sstables/**
+test/data/**
examples/pig/**
+examples/triggers/build.xml
+examples/triggers/conf/*
examples/hadoop_word_count/conf/log4j.properties
pylib/cqlshlib/test/**
- src/resources/org/apache/cassandra/config/version.properties
+ src/resources/org/apache/cassandra/config/version.properties
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
----------------------------------------------------------------------
[2/3] git commit: Improve CQL3 documentation section on COMPACT
STORAGE (CASSANDRA-6642)
Posted by sl...@apache.org.
Improve CQL3 documentation section on COMPACT STORAGE (CASSANDRA-6642)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cb045a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cb045a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cb045a5
Branch: refs/heads/cassandra-2.0
Commit: 4cb045a589e5807818a20e2b264a266f0cccccd7
Parents: 6a93144
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 12:58:16 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 12:58:16 2014 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cb045a5/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index b02d24a..8b6cb08 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -277,7 +277,7 @@ CREATE TABLE t (
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
+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.
@@ -287,9 +287,9 @@ h4(#createTableOptions). @<option>@
The @CREATE TABLE@ statement supports a number of options that controls the configuration of a new table. These options can be specified after the @WITH@ keyword.
-The first of these option is @COMPACT STORAGE@. This option is meanly targeted towards backward compatibility with some table definition created before CQL3. But it also provides a slightly more compact layout of data on disk, though at the price of flexibility and extensibility, and for that reason is not recommended unless for the backward compatibility reason. The restriction for table with @COMPACT STORAGE@ is that they support one and only one column outside of the ones part of the @PRIMARY KEY@. It also follows that columns cannot be added nor removed after creation. A table with @COMPACT STORAGE@ must also define at least one "clustering key":createTablepartitionClustering.
+The first of these option is @COMPACT STORAGE@. This option is mainly targeted towards backward compatibility for definitions created before CQL3 (see "www.datastax.com/dev/blog/thrift-to-cql3":http://www.datastax.com/dev/blog/thrift-to-cql3 for more details). The option also provides a slightly more compact layout of data on disk but at the price of diminished flexibility and extensibility for the table. Most notably, @COMPACT STORAGE@ tables cannot have collections and a @COMPACT STORAGE@ table with at least one clustering column supports exactly one (as in not 0 nor more than 1) column not part of the @PRIMARY KEY@ definition (which imply in particular that you cannot add nor remove columns after creation). For those reasons, @COMPACT STORAGE@ is not recommended outside of the backward compatibility reason evoked above.
-Another option is @CLUSTERING ORDER@. It allows to define the ordering of rows on disk. It takes the list of the clustering key names with, for each of them, the on-disk order (Ascending or descending). Note that this option affects "what @ORDER BY@ are allowed during @SELECT@":#selectOrderBy.
+Another option is @CLUSTERING ORDER@. It allows to define the ordering of rows on disk. It takes the list of the clustering column names with, for each of them, the on-disk order (Ascending or descending). Note that this option affects "what @ORDER BY@ are allowed during @SELECT@":#selectOrderBy.
Table creation supports the following other @<property>@:
@@ -668,7 +668,7 @@ Moreover, the @IN@ relation is only allowed on the last column of the partition
h4(#selectOrderBy). @<order-by>@
The @ORDER BY@ option allows to select the order of the returned results. It takes as argument a list of column names along with the order for the column (@ASC@ for ascendant and @DESC@ for descendant, omitting the order being equivalent to @ASC@). Currently the possible orderings are limited (which depends on the table "@CLUSTERING ORDER@":#createTableOptions):
-* if the table has been defined without any specific @CLUSTERING ORDER@, then then allowed orderings are the order induced by the clustering key and the reverse of that one.
+* if the table has been defined without any specific @CLUSTERING ORDER@, then then allowed orderings are the order induced by the clustering columns and the reverse of that one.
* otherwise, the orderings allowed are the order of the @CLUSTERING ORDER@ option and the reversed one.
h4(#selectLimit). @LIMIT@
@@ -942,7 +942,7 @@ CREATE TABLE users (
...
)
-then the @token@ function will take a single argument of type @text@ (in that case, the partition key is @userid@ (there is no clustering key so the partition key is the same than the primary key)), and the return type will be @bigint@.
+then the @token@ function will take a single argument of type @text@ (in that case, the partition key is @userid@ (there is no clustering columns so the partition key is the same than the primary key)), and the return type will be @bigint@.
h3(#timeuuidFun). Timeuuid functions