Updated Branches: refs/heads/trunk ab2614ca1 -> 171c661e7
cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/171c661e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/171c661e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/171c661e Branch: refs/heads/trunk Commit: 171c661e773bcc0f50dc5ad09290eba700e4d00d Parents: ab2614c Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Oct 27 09:48:22 2012 -0700 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Oct 29 23:11:59 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../db/compaction/AbstractCompactionStrategy.java | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/171c661e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 3b1df99..e981a9c 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -187,7 +187,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean private void maybeReloadCompactionStrategy() { // Check if there is a need for reloading - if (metadata.compactionStrategyClass.equals(compactionStrategy.getClass()) && metadata.compactionStrategyOptions.equals(compactionStrategy.getOptions())) + if (metadata.compactionStrategyClass.equals(compactionStrategy.getClass()) && metadata.compactionStrategyOptions.equals(compactionStrategy.options)) return; // TODO is there a way to avoid locking here? http://git-wip-us.apache.org/repos/asf/cassandra/blob/171c661e/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index c2271bb..ec328e5 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -35,12 +35,12 @@ import org.apache.cassandra.io.sstable.SSTableReader; public abstract class AbstractCompactionStrategy { protected static final float DEFAULT_TOMBSTONE_THRESHOLD = 0.2f; - protected static final String TOMBSTONE_THRESHOLD_KEY = "tombstone_threshold"; + protected static final String TOMBSTONE_THRESHOLD_OPTION = "tombstone_threshold"; - protected final ColumnFamilyStore cfs; - protected final Map<String, String> options; + public final Map<String, String> options; - protected float tombstoneThreshold; + protected final ColumnFamilyStore cfs; + protected final float tombstoneThreshold; protected AbstractCompactionStrategy(ColumnFamilyStore cfs, Map<String, String> options) { @@ -48,15 +48,10 @@ public abstract class AbstractCompactionStrategy this.cfs = cfs; this.options = options; - String optionValue = options.get(TOMBSTONE_THRESHOLD_KEY); + String optionValue = options.get(TOMBSTONE_THRESHOLD_OPTION); tombstoneThreshold = optionValue == null ? DEFAULT_TOMBSTONE_THRESHOLD : Float.parseFloat(optionValue); } - public Map<String, String> getOptions() - { - return options; - } - /** * Releases any resources if this strategy is shutdown (when the CFS is reloaded after a schema change). * Default is to do nothing.
