You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/10 02:43:25 UTC
[1/7] git commit: migrate 1.1 schema_columnfamilies.key_alias column
to key_aliases patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
Updated Branches:
refs/heads/trunk 505898135 -> 9bc8fa2a1
migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd14512f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd14512f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd14512f
Branch: refs/heads/trunk
Commit: fd14512fd2a4e5031ba3d511ba27c113b3087d07
Parents: f5d632f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 9 15:56:07 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 9 15:56:14 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/db/SystemTable.java | 38 ++++++++++++++++++++
2 files changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd14512f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f8c472c..7630084 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
1.2.9
+ * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
+ (CASSANDRA-5800)
* add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd14512f/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 318b34d..32f5fe0 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -180,6 +180,44 @@ public class SystemTable
logger.info("Possible old-format hints found. Truncating");
oldHintsCfs.truncate();
}
+
+ migrateKeyAliases();
+ }
+
+
+ /**
+ * 1.1 used a key_alias column; 1.2 changed that to key_aliases as part of CQL3
+ */
+ private static void migrateKeyAliases()
+ {
+ for (UntypedResultSet.Row row : processInternal("SELECT keyspace_name, columnfamily_name, key_aliases, key_alias FROM system.schema_columnfamilies"))
+ {
+ String key_alias = null;
+ String key_aliases = null;
+ try
+ {
+ key_alias = row.getString("key_alias");
+ }
+ catch (NullPointerException e)
+ {
+ // column value is null
+ }
+ try
+ {
+ key_aliases = row.getString("key_aliases");
+ }
+ catch (NullPointerException e)
+ {
+ // column value is null
+ }
+ if (key_alias != null && key_aliases == null)
+ {
+ String keyspace = row.getString("keyspace_name");
+ String columnfamily = row.getString("columnfamily_name");
+ processInternal(String.format("UPDATE system.schema_columnfamilies set key_aliases='[\"%s\"]' , key_alias = null where keyspace_name='%s' and columnfamily_name='%s'",
+ key_alias, keyspace, columnfamily));
+ }
+ }
}
public static void saveTruncationRecord(ColumnFamilyStore cfs, long truncatedAt, ReplayPosition position)
[5/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/298e91df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/298e91df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/298e91df
Branch: refs/heads/trunk
Commit: 298e91df73d752c7a0bf412dcd72d0076dab9c95
Parents: 5a9dd3d 2a83793
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:42:25 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:42:25 2013 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/298e91df/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index ece3a2d,22248ef..ba90994
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -630,13 -611,10 +630,13 @@@ SELECT name AS user_name, occupation A
SELECT time, value
FROM events
WHERE event_type = 'myEvent'
- AND time > 2011-02-03
- AND time <= 2012-01-01
+ AND time > '2011-02-03'
+ AND time <= '2012-01-01'
SELECT COUNT(*) FROM users;
+
+SELECT COUNT(*) AS user_count FROM users;
+
p.
The @SELECT@ statements reads one or more columns for one or more rows in a table. It returns a result-set of rows, where each row contains the collection of columns corresponding to the query.
[3/7] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0.0' 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/9abead4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9abead4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9abead4c
Branch: refs/heads/trunk
Commit: 9abead4ca414672522040094d9e5de79f9f9c345
Parents: e08d3e2 5a9dd3d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 9 15:56:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 9 15:56:49 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[7/7] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bc8fa2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bc8fa2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bc8fa2a
Branch: refs/heads/trunk
Commit: 9bc8fa2a19a28c4de7f0352c798f1e0073a5d016
Parents: 5058981 27ccae8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:43:17 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:43:17 2013 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: Correct timestamp formatting in CQL3 doc
Posted by al...@apache.org.
Correct timestamp formatting in CQL3 doc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a837937
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a837937
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a837937
Branch: refs/heads/trunk
Commit: 2a8379372e6cbcd2fa3008b203c70f57ad29f392
Parents: fd14512
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:41:58 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:41:58 2013 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a837937/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 532d341..22248ef 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -611,8 +611,8 @@ SELECT name, occupation FROM users WHERE userid IN (199, 200, 207);
SELECT time, value
FROM events
WHERE event_type = 'myEvent'
- AND time > 2011-02-03
- AND time <= 2012-01-01
+ AND time > '2011-02-03'
+ AND time <= '2012-01-01'
SELECT COUNT(*) FROM users;
p.
@@ -646,13 +646,13 @@ CREATE TABLE posts (
The following query is allowed:
bc(sample).
-SELECT entry_title, content FROM posts WHERE userid='john doe' AND blog_title='John's Blog' AND posted_at >= 2012-01-01 AND posted_at < 2012-01-31
+SELECT entry_title, content FROM posts WHERE userid='john doe' AND blog_title='John's Blog' AND posted_at >= '2012-01-01' AND posted_at < '2012-01-31'
But the following one is not, as it does not select a contiguous set of rows (and we suppose no secondary indexes are set):
bc(sample).
// Needs a blog_title to be set to select ranges of posted_at
-SELECT entry_title, content FROM posts WHERE userid='john doe' AND posted_at >= 2012-01-01 AND posted_at < 2012-01-31
+SELECT entry_title, content FROM posts WHERE userid='john doe' AND posted_at >= '2012-01-01' AND posted_at < '2012-01-31'
When specifying relations, the @TOKEN@ function can be used on the @PARTITION KEY@ column to query. In that case, rows will be selected based on the token of their @PARTITION_KEY@ rather than on the value. Note that the token of a key depends on the partitioner in use, and that in particular the RandomPartitioner won't yeld a meaningful order. Also note that ordering partitioners always order token values by bytes (so even if the partition key is of type int, @token(-1) > token(0)@ in particular). Example:
[6/7] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0.0' 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/27ccae88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ccae88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27ccae88
Branch: refs/heads/trunk
Commit: 27ccae88200073289e40a4569a046f4743b7f309
Parents: 9abead4 298e91d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:42:51 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:42:51 2013 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a9dd3d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a9dd3d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a9dd3d9
Branch: refs/heads/trunk
Commit: 5a9dd3d993082c5e458a2c00e612208f9dd1d13f
Parents: d62382b fd14512
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 9 15:56:28 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 9 15:56:28 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------