cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: remove unused compaction controller field from Unwrapper iterator
Date Fri, 19 Apr 2013 04:55:27 GMT
Updated Branches:
  refs/heads/cassandra-1.2 e2aeb7474 -> a89b21909


remove unused compaction controller field from Unwrapper iterator


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

Branch: refs/heads/cassandra-1.2
Commit: a89b219090a6658bb0866f68350b82ab361a8f74
Parents: e2aeb74
Author: Dave Brosius <dbrosius@apache.org>
Authored: Fri Apr 19 00:54:49 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Fri Apr 19 00:54:49 2013 -0400

----------------------------------------------------------------------
 .../db/compaction/ParallelCompactionIterable.java  |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89b2190/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
index 225393e..e91846d 100644
--- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
@@ -71,18 +71,16 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable
         List<CloseableIterator<RowContainer>> sources = new ArrayList<CloseableIterator<RowContainer>>(scanners.size());
         for (ICompactionScanner scanner : scanners)
             sources.add(new Deserializer(scanner, maxInMemorySize));
-        return new Unwrapper(MergeIterator.get(sources, RowContainer.comparator, new Reducer()),
controller);
+        return new Unwrapper(MergeIterator.get(sources, RowContainer.comparator, new Reducer()));
     }
 
     private static class Unwrapper extends AbstractIterator<AbstractCompactedRow> implements
CloseableIterator<AbstractCompactedRow>
     {
         private final CloseableIterator<CompactedRowContainer> reducer;
-        private final CompactionController controller;
 
-        public Unwrapper(CloseableIterator<CompactedRowContainer> reducer, CompactionController
controller)
+        public Unwrapper(CloseableIterator<CompactedRowContainer> reducer)
         {
             this.reducer = reducer;
-            this.controller = controller;
         }
 
         protected AbstractCompactedRow computeNext()


Mime
View raw message