merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/181f3736 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/181f3736 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/181f3736 Branch: refs/heads/trunk Commit: 181f3736c4d04448be9336107454b6d569daf845 Parents: cb981e6 d735cfd Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 30 15:42:55 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 30 15:42:55 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/181f3736/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 30b70a7,a809bc6..ce9490c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -11,7 -3,11 +11,8 @@@ Merged from 1.2 * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) * update default LCS sstable size to 160MB (CASSANDRA-5727) + * Allow compacting 2Is via nodetool (CASSANDRA-5670) * Hex-encode non-String keys in OPP (CASSANDRA-5793) - - -1.2.8 * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) * cqlsh: add collections support to COPY (CASSANDRA-5698) * retry important messages for any IOException (CASSANDRA-5804) http://git-wip-us.apache.org/repos/asf/cassandra/blob/181f3736/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index d0581fb,54f8abd..58a0634 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2091,9 -2163,9 +2091,9 @@@ public class StorageService extends Not cfStore.sstablesRewrite(excludeCurrentVersion); } - public void forceTableCompaction(String tableName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException + public void forceKeyspaceCompaction(String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException { - for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false, keyspaceName, columnFamilies)) - for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false, tableName, columnFamilies)) ++ for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false, keyspaceName, columnFamilies)) { cfStore.forceMajorCompaction(); }
