Updated Branches: refs/heads/cassandra-1.0 00a553438 -> 043d18083 refs/heads/cassandra-1.1 1bfb68518 -> dad8d80fe refs/heads/trunk 2155250fd -> 15d690fdc
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15d690fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15d690fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15d690fd Branch: refs/heads/trunk Commit: 15d690fdc2362e93beeddc364dbc63a56ab5ec44 Parents: 2155250 dad8d80 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat May 26 00:25:25 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat May 26 00:25:25 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++- .../db/compaction/AbstractCompactionTask.java | 5 ++ .../cassandra/db/compaction/CompactionManager.java | 21 +++++++- .../cassandra/db/compaction/LeveledManifest.java | 10 +++- .../compaction/SizeTieredCompactionStrategy.java | 41 +++++++-------- 5 files changed, 60 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d690fd/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d690fd/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java index 9826941,1449c87..49c98d2 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java @@@ -90,15 -85,8 +90,20 @@@ public abstract class AbstractCompactio // execute (if sstable can't be marked successfully) protected void cancel() {} + public AbstractCompactionTask isUserDefined(boolean isUserDefined) + { + this.isUserDefined = isUserDefined; + return this; + } + + public AbstractCompactionTask setCompactionType(OperationType compactionType) + { + this.compactionType = compactionType; + return this; + } ++ + public String toString() + { + return "CompactionTask(" + sstables + ")"; + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d690fd/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d690fd/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d690fd/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------
