Updated Branches: refs/heads/cassandra-1.2 f3091835e -> cef8eb07d refs/heads/trunk 95ffb5d2d -> ed79a59d9
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed79a59d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed79a59d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed79a59d Branch: refs/heads/trunk Commit: ed79a59d95578502ae3ff087dcaccb8abc9dba40 Parents: 95ffb5d cef8eb0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Feb 6 08:34:03 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Feb 6 08:34:03 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/CompactionManager.java | 1 - .../apache/cassandra/service/StorageService.java | 67 ++++++++++++--- src/java/org/apache/cassandra/tools/NodeCmd.java | 7 ++- src/java/org/apache/cassandra/tools/NodeProbe.java | 69 ++++++++++++-- 5 files changed, 122 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 1eca2b9,5f00c88..ef3237d --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2240,9 -2285,9 +2285,9 @@@ public class StorageService extends Not public void forceTableFlush(final String tableName, final String... columnFamilies) throws IOException, ExecutionException, InterruptedException { - for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName, columnFamilies)) + for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false, tableName, columnFamilies)) { - logger.debug("Forcing flush on keyspace " + tableName + ", CF " + cfStore.getColumnFamilyName()); + logger.debug("Forcing flush on keyspace " + tableName + ", CF " + cfStore.name); cfStore.forceBlockingFlush(); } } @@@ -2367,9 -2412,9 +2412,9 @@@ public AntiEntropyService.RepairFuture forceTableRepair(final Range<Token> range, final String tableName, boolean isSequential, boolean isLocal, final String... columnFamilies) throws IOException { ArrayList<String> names = new ArrayList<String>(); - for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName, columnFamilies)) + for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false, tableName, columnFamilies)) { - names.add(cfStore.getColumnFamilyName()); + names.add(cfStore.name); } if (names.isEmpty())
