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/03/22 15:26:17 UTC
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f3c2071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f3c2071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f3c2071
Branch: refs/heads/cassandra-1.2
Commit: 9f3c2071bdd54c90a00392f10678819cf5c84847
Parents: d551382 4260413
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Mar 22 09:25:54 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Mar 22 09:25:54 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/DefsTable.java | 2 ++
.../apache/cassandra/tools/StandaloneScrubber.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f3c2071/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 914789b,88d184e..e64f3c9
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -313,11 -321,13 +313,13 @@@ public class DefsTabl
}
// store deserialized keyspaces into new place
- dumpToStorage(keyspaces);
+ save(keyspaces);
+ flushSchemaCFs();
+
logger.info("Truncating deprecated system column families (migrations, schema)...");
- dropColumnFamily(Table.SYSTEM_TABLE, OLD_MIGRATIONS_CF);
- dropColumnFamily(Table.SYSTEM_TABLE, OLD_SCHEMA_CF);
+ dropColumnFamily(Table.SYSTEM_KS, OLD_MIGRATIONS_CF);
+ dropColumnFamily(Table.SYSTEM_KS, OLD_SCHEMA_CF);
}
return keyspaces;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f3c2071/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------