You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/09/04 23:22:35 UTC
[1/3] git commit: change SYSTEM_TABLE to SYSTEM_KS related to
CASSANDRA-4561 merge
Updated Branches:
refs/heads/trunk 6b29ab709 -> cf23bd0a0
change SYSTEM_TABLE to SYSTEM_KS related to CASSANDRA-4561 merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf23bd0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf23bd0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf23bd0a
Branch: refs/heads/trunk
Commit: cf23bd0a0fd192d991e971bcae94c2447126f873
Parents: d90eaf5
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Wed Sep 5 00:22:19 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Wed Sep 5 00:22:19 2012 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/DefsTable.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf23bd0a/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 a9fac36..0c296e6 100644
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@ -166,7 +166,7 @@ public class DefsTable
private static void fixSchemaNanoTimestamp(String columnFamily) throws IOException
{
- ColumnFamilyStore cfs = Table.open(Table.SYSTEM_TABLE).getColumnFamilyStore(columnFamily);
+ ColumnFamilyStore cfs = Table.open(Table.SYSTEM_KS).getColumnFamilyStore(columnFamily);
boolean needsCleanup = false;
long timestamp = FBUtilities.timestampMicros();
@@ -214,7 +214,7 @@ public class DefsTable
if (invalidSchemaRow(row))
continue;
- RowMutation mutation = new RowMutation(Table.SYSTEM_TABLE, row.key.key);
+ RowMutation mutation = new RowMutation(Table.SYSTEM_KS, row.key.key);
for (IColumn column : row.cf.columns)
{