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/13 20:57:02 UTC
[1/2] git commit: Migrate key_alias->key_aliases on every schema
migration (1.2)
Updated Branches:
refs/heads/cassandra-2.0.0 42b260246 -> 56bd81a7a
Migrate key_alias->key_aliases on every schema migration (1.2)
Another follow-up to 5800
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82081c7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82081c7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82081c7b
Branch: refs/heads/cassandra-2.0.0
Commit: 82081c7b4b2ad2d602374f0817abc4cfc2c86c98
Parents: 2d20997
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 13 20:52:34 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 13 20:54:24 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/DefsTable.java | 4 ++++
src/java/org/apache/cassandra/db/SystemTable.java | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82081c7b/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTable.java b/src/java/org/apache/cassandra/db/DefsTable.java
index ea15cd0..4e9cf01 100644
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@ -341,6 +341,10 @@ public class DefsTable
for (RowMutation mutation : mutations)
mutation.apply();
+ // Must be called after each schema pull and not just on startup to guarantee the migration.
+ // See CASSANDRA-5800 comments for the details.
+ SystemTable.migrateKeyAlias();
+
if (!StorageService.instance.isClientMode())
flushSchemaCFs();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82081c7b/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 81e675e..a87ab50 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -184,11 +184,10 @@ public class SystemTable
migrateKeyAlias();
}
-
/**
* 1.1 used a key_alias column; 1.2 changed that to key_aliases as part of CQL3
*/
- private static void migrateKeyAlias()
+ public static void migrateKeyAlias()
{
String selectQuery = String.format("SELECT keyspace_name, columnfamily_name, writetime(type), key_aliases, key_alias FROM %s.%s",
Table.SYSTEM_KS,
[2/2] 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/56bd81a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56bd81a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56bd81a7
Branch: refs/heads/cassandra-2.0.0
Commit: 56bd81a7a0157cb15f3fac68cf2478f9e29cee5f
Parents: 42b2602 82081c7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 13 20:56:50 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 13 20:56:50 2013 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------