You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/08/17 23:38:19 UTC
cassandra git commit: no need to hold onto the current ss table
reader as a field
Repository: cassandra
Updated Branches:
refs/heads/trunk f808b5c7b -> 858004791
no need to hold onto the current ss table reader as a field
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85800479
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85800479
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85800479
Branch: refs/heads/trunk
Commit: 858004791977f0db56da201f1ab84c4efe75d974
Parents: f808b5c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Aug 17 19:37:47 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Aug 17 19:38:06 2016 -0400
----------------------------------------------------------------------
.../cassandra/db/compaction/LeveledCompactionStrategy.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85800479/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index c224f91..13f454e 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -326,7 +326,6 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy
private ISSTableScanner currentScanner;
private long positionOffset;
- private SSTableReader currentSSTable;
private long totalBytesScanned = 0;
public LeveledScanner(Collection<SSTableReader> sstables, Collection<Range<Token>> ranges)
@@ -355,7 +354,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy
Collections.sort(this.sstables, SSTableReader.sstableComparator);
sstableIterator = this.sstables.iterator();
assert sstableIterator.hasNext(); // caller should check intersecting first
- currentSSTable = sstableIterator.next();
+ SSTableReader currentSSTable = sstableIterator.next();
currentScanner = currentSSTable.getScanner(ranges, null);
}
@@ -409,7 +408,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy
currentScanner = null;
return endOfData();
}
- currentSSTable = sstableIterator.next();
+ SSTableReader currentSSTable = sstableIterator.next();
currentScanner = currentSSTable.getScanner(ranges, null);
}
}