You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/09 22:56:55 UTC
[1/6] 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/cassandra-1.2 f5d632fa7 -> fd14512fd
refs/heads/cassandra-2.0 e08d3e2ad -> 9abead4ca
refs/heads/cassandra-2.0.0 d62382bfe -> 5a9dd3d99
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/cassandra-1.2
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)
[2/6] git commit: migrate 1.1 schema_columnfamilies.key_alias column
to key_aliases patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
Posted by jb...@apache.org.
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/cassandra-2.0.0
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/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by jb...@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/cassandra-2.0.0
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: migrate 1.1 schema_columnfamilies.key_alias column
to key_aliases patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
Posted by jb...@apache.org.
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/cassandra-2.0
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)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by jb...@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/cassandra-2.0
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@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/cassandra-2.0
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
----------------------------------------------------------------------
----------------------------------------------------------------------