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 2015/02/27 08:34:25 UTC
cassandra git commit: simplify
Repository: cassandra
Updated Branches:
refs/heads/trunk 12997504b -> b3c4c0a2a
simplify
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3c4c0a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3c4c0a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3c4c0a2
Branch: refs/heads/trunk
Commit: b3c4c0a2a7050711e4b50c44c50f4ea2928523ff
Parents: 1299750
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Feb 27 02:34:00 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Feb 27 02:34:00 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3c4c0a2/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 e126239..f7e5366 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -136,7 +136,6 @@ public class Scrubber implements Closeable
outputHandler.debug("Reading row at " + rowStart);
DecoratedKey key = null;
- long dataSize = -1;
try
{
key = sstable.partitioner.decorateKey(ByteBufferUtil.readWithShortLength(dataFile));
@@ -170,7 +169,7 @@ public class Scrubber implements Closeable
: rowStart + 2 + currentIndexKey.remaining();
long dataSizeFromIndex = nextRowPositionFromIndex - dataStartFromIndex;
- dataSize = dataSizeFromIndex;
+ long dataSize = dataSizeFromIndex;
// avoid an NPE if key is null
String keyName = key == null ? "(unreadable key)" : ByteBufferUtil.bytesToHex(key.getKey());
outputHandler.debug(String.format("row %s is %s bytes", keyName, dataSize));