Repository: cassandra Updated Branches: refs/heads/trunk 4ebab6616 -> 9c49fbcc5
Mark couple of API methods for compactions as deprecated as they are handled by CompactionStrategyManager Patch by Lerh Chuan Low; reviewed by marcuse for CASSANDRA-13541 This closes #114 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c49fbcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c49fbcc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c49fbcc Branch: refs/heads/trunk Commit: 9c49fbcc5ccb03e64bb95c43fc7134ddb281cec4 Parents: 4ebab66 Author: Lerh Chuan Low <[email protected]> Authored: Mon May 22 12:20:25 2017 +1000 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jun 2 15:41:51 2017 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 +++ .../org/apache/cassandra/db/compaction/PendingRepairManager.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c49fbcc/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 74c6419..5333683 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -213,10 +213,12 @@ public abstract class AbstractCompactionStrategy */ public abstract long getMaxSSTableBytes(); + @Deprecated public void enable() { } + @Deprecated public void disable() { } @@ -540,6 +542,7 @@ public abstract class AbstractCompactionStrategy return uncheckedOptions; } + @Deprecated public boolean shouldBeEnabled() { String optionValue = options.get(COMPACTION_ENABLED); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c49fbcc/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 27e8e9c..eafa03c 100644 --- a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java +++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java @@ -183,11 +183,13 @@ 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
