cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: cleanup
Date Fri, 09 Nov 2012 21:17:40 GMT
cleanup


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

Branch: refs/heads/cassandra-1.2
Commit: e0a0eb751f01b3deca3a1d02e77913b222453e3a
Parents: 03f8fec
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Nov 9 09:52:21 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Nov 9 09:52:21 2012 -0600

----------------------------------------------------------------------
 .../db/compaction/CompactionController.java        |   10 +++++++++-
 .../cassandra/db/compaction/CompactionManager.java |    2 +-
 .../apache/cassandra/db/compaction/Scrubber.java   |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0a0eb75/src/java/org/apache/cassandra/db/compaction/CompactionController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 1a9e08c..3b04833 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -69,7 +69,15 @@ public class CompactionController
              DataTracker.buildIntervalTree(cfs.getOverlappingSSTables(sstables)));
     }
 
-    protected CompactionController(ColumnFamilyStore cfs,
+    /**
+     * Constructor that subclasses may use when overriding shouldPurge to not need overlappingTree
+     */
+    protected CompactionController(ColumnFamilyStore cfs, int maxValue)
+    {
+        this(cfs, maxValue, null);
+    }
+
+    private CompactionController(ColumnFamilyStore cfs,
                                    int gcBefore,
                                    DataTracker.SSTableIntervalTree overlappingTree)
     {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0a0eb75/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index a93f392..4f16f6a 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -900,7 +900,7 @@ public class CompactionManager implements CompactionManagerMBean
     {
         public ValidationCompactionController(ColumnFamilyStore cfs, int gcBefore)
         {
-            super(cfs, gcBefore, null);
+            super(cfs, gcBefore);
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0a0eb75/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
index ec99059..3946c37 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -345,7 +345,7 @@ public class Scrubber implements Closeable
     {
         public ScrubController(ColumnFamilyStore cfs)
         {
-            super(cfs, Integer.MAX_VALUE, DataTracker.buildIntervalTree(Collections.<SSTableReader>emptyList()));
+            super(cfs, Integer.MAX_VALUE);
         }
 
         @Override


Mime
View raw message