cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] git commit: Don't break API in minor rev, followup to CASSANDRA-6958
Date Tue, 01 Apr 2014 20:29:30 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 d6b582614 -> 92b40fd90


Don't break API in minor rev, followup to CASSANDRA-6958


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80b3e6cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80b3e6cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80b3e6cc

Branch: refs/heads/cassandra-2.1
Commit: 80b3e6cc3b1d6fdae91193563626f0823c92c528
Parents: 55fba6a
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Apr 1 22:03:30 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Apr 1 22:16:10 2014 +0200

----------------------------------------------------------------------
 .../cassandra/db/compaction/AbstractCompactionStrategy.java    | 5 ++++-
 .../cassandra/db/compaction/SizeTieredCompactionStrategy.java  | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80b3e6cc/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 d3339d5..941d3d7 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@ -167,7 +167,10 @@ public abstract class AbstractCompactionStrategy
      */
     public abstract AbstractCompactionTask getUserDefinedTask(Collection<SSTableReader>
sstables, final int gcBefore);
 
-    public abstract AbstractCompactionTask getCompactionTask(Collection<SSTableReader>
sstables, final int gcBefore, long maxSSTableBytes);
+    public AbstractCompactionTask getCompactionTask(Collection<SSTableReader> sstables,
final int gcBefore, long maxSSTableBytes)
+    {
+        return new CompactionTask(cfs, sstables, gcBefore);
+    }
 
     /**
      * @return the number of background tasks estimated to still be needed for this columnfamilystore

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80b3e6cc/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
index fae52e2..0f94918 100644
--- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
@@ -271,12 +271,6 @@ public class SizeTieredCompactionStrategy extends AbstractCompactionStrategy
         return new CompactionTask(cfs, sstables, gcBefore).setUserDefined(true);
     }
 
-    @Override
-    public AbstractCompactionTask getCompactionTask(Collection<SSTableReader> sstables,
int gcBefore, long maxSSTableBytes)
-    {
-        return new CompactionTask(cfs, sstables, gcBefore);
-    }
-
     public int getEstimatedRemainingTasks()
     {
         return estimatedRemainingTasks;


Mime
View raw message