Repository: cassandra Updated Branches: refs/heads/trunk ed0ded123 -> df51d0cbb
Remove unused and deprecated methods from AbstractCompactionStrategy Patch by Paulo Motta; Reviewed by Marcus Eriksson for CASSANDRA-14081 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df51d0cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df51d0cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df51d0cb Branch: refs/heads/trunk Commit: df51d0cbbaaa99aea9bc2a582f788f9170dbdc03 Parents: ed0ded1 Author: Paulo Motta <pauloricard...@gmail.com> Authored: Thu Nov 30 23:15:44 2017 +1100 Committer: Paulo Motta <pa...@apache.org> Committed: Thu Dec 7 05:13:29 2017 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 3 +- .../compaction/AbstractCompactionStrategy.java | 55 -------------------- .../compaction/CompactionStrategyManager.java | 32 ------------ .../db/compaction/PendingRepairManager.java | 12 ----- 5 files changed, 3 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df51d0cb/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b4a7b62..d526c09 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Remove unused and deprecated methods from AbstractCompactionStrategy (CASSANDRA-14081) * Fix Distribution.average in cassandra-stress (CASSANDRA-14090) * Support a means of logging all queries as they were invoked (CASSANDRA-13983) * Presize collections (CASSANDRA-13760) http://git-wip-us.apache.org/repos/asf/cassandra/blob/df51d0cb/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 4dae44a..872cd80 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1604,7 +1604,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean void replaceFlushed(Memtable memtable, Collection<SSTableReader> sstables) { - compactionStrategyManager.replaceFlushed(memtable, sstables); + data.replaceFlushed(memtable, sstables); + CompactionManager.instance.submitBackground(this); } public boolean isValid() http://git-wip-us.apache.org/repos/asf/cassandra/blob/df51d0cb/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 0a07ce6..e88524f 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db.compaction; import java.util.*; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; @@ -36,7 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Memtable; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; @@ -45,7 +43,6 @@ import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.schema.CompactionParams; -import org.apache.cassandra.utils.JVMStabilityInspector; /** * Pluggable compaction strategy determines how SSTables get merged. @@ -115,8 +112,6 @@ public abstract class AbstractCompactionStrategy uncheckedTombstoneCompaction = optionValue == null ? DEFAULT_UNCHECKED_TOMBSTONE_COMPACTION_OPTION : Boolean.parseBoolean(optionValue); optionValue = options.get(LOG_ALL_OPTION); logAll = optionValue == null ? DEFAULT_LOG_ALL_OPTION : Boolean.parseBoolean(optionValue); - if (!shouldBeEnabled()) - this.disable(); } catch (ConfigurationException e) { @@ -213,47 +208,6 @@ public abstract class AbstractCompactionStrategy */ public abstract long getMaxSSTableBytes(); - @Deprecated - public void enable() - { - } - - @Deprecated - public void disable() - { - } - - /** - * @return whether or not MeteredFlusher should be able to trigger memtable flushes for this CF. - */ - public boolean isAffectedByMeteredFlusher() - { - return true; - } - - /** - * If not affected by MeteredFlusher (and handling flushing on its own), override to tell MF how much - * space to reserve for this CF, i.e., how much space to subtract from `memtable_total_space_in_mb` when deciding - * if other memtables should be flushed or not. - */ - public long getMemtableReservedSize() - { - return 0; - } - - /** - * Handle a flushed memtable. - * - * @param memtable the flushed memtable - * @param sstables the written sstables. can be null or empty if the memtable was clean. - */ - public void replaceFlushed(Memtable memtable, Collection<SSTableReader> sstables) - { - cfs.getTracker().replaceFlushed(memtable, sstables); - if (sstables != null && !sstables.isEmpty()) - CompactionManager.instance.submitBackground(cfs); - } - /** * Filters SSTables that are to be blacklisted from the given collection * @@ -517,15 +471,6 @@ public abstract class AbstractCompactionStrategy return uncheckedOptions; } - @Deprecated - public boolean shouldBeEnabled() - { - String optionValue = options.get(COMPACTION_ENABLED); - - return optionValue == null || Boolean.parseBoolean(optionValue); - } - - /** * Method for grouping similar SSTables together, This will be used by * anti-compaction to determine which SSTables should be anitcompacted http://git-wip-us.apache.org/repos/asf/cassandra/blob/df51d0cb/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index 0260bb8..aa50fb1 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java @@ -406,13 +406,6 @@ public class CompactionStrategyManager implements INotificationConsumer startup(); } - public void replaceFlushed(Memtable memtable, Collection<SSTableReader> sstables) - { - cfs.getTracker().replaceFlushed(memtable, sstables); - if (sstables != null && !sstables.isEmpty()) - CompactionManager.instance.submitBackground(cfs); - } - public int getUnleveledSSTables() { readLock.lock(); @@ -677,12 +670,6 @@ public class CompactionStrategyManager implements INotificationConsumer writeLock.lock(); try { - if (repaired != null) - repaired.forEach(AbstractCompactionStrategy::enable); - if (unrepaired != null) - unrepaired.forEach(AbstractCompactionStrategy::enable); - if (pendingRepairs != null) - pendingRepairs.forEach(PendingRepairManager::enable); // enable this last to make sure the strategies are ready to get calls. enabled = true; } @@ -697,14 +684,7 @@ public class CompactionStrategyManager implements INotificationConsumer writeLock.lock(); try { - // disable this first avoid asking disabled strategies for compaction tasks enabled = false; - if (repaired != null) - repaired.forEach(AbstractCompactionStrategy::disable); - if (unrepaired != null) - unrepaired.forEach(AbstractCompactionStrategy::disable); - if (pendingRepairs != null) - pendingRepairs.forEach(PendingRepairManager::disable); } finally { @@ -949,18 +929,6 @@ public class CompactionStrategyManager implements INotificationConsumer } } - /** - * @deprecated use {@link #getUserDefinedTasks(Collection, int)} instead. - */ - @Deprecated() - public AbstractCompactionTask getUserDefinedTask(Collection<SSTableReader> sstables, int gcBefore) - { - validateForCompaction(sstables, cfs, getDirectories()); - List<AbstractCompactionTask> tasks = getUserDefinedTasks(sstables, gcBefore); - assert tasks.size() == 1; - return tasks.get(0); - } - public int getEstimatedRemainingTasks() { int tasks = 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/df51d0cb/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java index 98acbdb..64aa3f2 100644 --- a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java +++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java @@ -202,18 +202,6 @@ class PendingRepairManager strategies.values().forEach(AbstractCompactionStrategy::shutdown); } - @Deprecated - synchronized void enable() - { - strategies.values().forEach(AbstractCompactionStrategy::enable); - } - - @Deprecated - synchronized void disable() - { - strategies.values().forEach(AbstractCompactionStrategy::disable); - } - private int getEstimatedRemainingTasks(UUID sessionID, AbstractCompactionStrategy strategy) { if (canCleanup(sessionID)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
