Updated Branches: refs/heads/trunk d1dd9a102 -> 5225ed944
rename legacy SchemaCf and MigrationsCf for consistency Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5225ed94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5225ed94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5225ed94 Branch: refs/heads/trunk Commit: 5225ed944b7c0d1ee440f690662aa59f0cc1d617 Parents: d1dd9a1 Author: Jonathan Ellis <[email protected]> Authored: Thu Nov 1 14:20:20 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Nov 1 14:20:20 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 4 ++-- .../org/apache/cassandra/config/KSMetaData.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5225ed94/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index bd072ab..921242a 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -84,9 +84,9 @@ public final class CFMetaData @Deprecated public static final CFMetaData OldHintsCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_HINTS_CF, 1, "unused", BytesType.instance, BytesType.instance); @Deprecated - public static final CFMetaData MigrationsCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, "unused", TimeUUIDType.instance, null); + public static final CFMetaData OldMigrationsCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, "unused", TimeUUIDType.instance, null); @Deprecated - public static final CFMetaData SchemaCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, "unused", UTF8Type.instance, null); + public static final CFMetaData OldSchemaCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, "unused", UTF8Type.instance, null); public static final CFMetaData IndexCf = compile(5, "CREATE TABLE \"" + SystemTable.INDEX_CF + "\" (" + "table_name text," http://git-wip-us.apache.org/repos/asf/cassandra/blob/5225ed94/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java index 72fc5c7..2d1b709 100644 --- a/src/java/org/apache/cassandra/config/KSMetaData.java +++ b/src/java/org/apache/cassandra/config/KSMetaData.java @@ -90,8 +90,8 @@ public final class KSMetaData CFMetaData.SchemaColumnsCf, CFMetaData.OldStatusCf, CFMetaData.OldHintsCf, - CFMetaData.MigrationsCf, - CFMetaData.SchemaCf); + CFMetaData.OldMigrationsCf, + CFMetaData.OldSchemaCf); return new KSMetaData(Table.SYSTEM_KS, LocalStrategy.class, Collections.<String, String>emptyMap(), true, cfDefs); }
