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 2013/10/09 23:25:03 UTC

git commit: remove decompression code in CompressedSequentialWriter patch by dbrosius reviewed by jbellis for cassandra-6176

Updated Branches:
  refs/heads/cassandra-2.0 6fae7a650 -> 9644f0989


remove decompression code in CompressedSequentialWriter
patch by dbrosius reviewed by jbellis for cassandra-6176


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

Branch: refs/heads/cassandra-2.0
Commit: 9644f098967d6ba9154725148a383b3502ef62c2
Parents: 6fae7a6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Oct 9 17:24:17 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Oct 9 17:24:17 2013 -0400

----------------------------------------------------------------------
 .../io/compress/CompressedSequentialWriter.java        | 13 -------------
 1 file changed, 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9644f098/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 386eca5..da4307e 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -21,7 +21,6 @@ import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.util.zip.Adler32;
-import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
 import org.apache.cassandra.io.FSReadError;
@@ -193,18 +192,6 @@ public class CompressedSequentialWriter extends SequentialWriter
         {
             out.seek(chunkOffset);
             out.readFully(compressed.buffer, 0, chunkSize);
-
-            int validBytes;
-            try
-            {
-                // decompress data chunk and store its length
-                validBytes = compressor.uncompress(compressed.buffer, 0, chunkSize, buffer, 0);
-            }
-            catch (IOException e)
-            {
-                throw new CorruptBlockException(getPath(), chunkOffset, chunkSize);
-            }
-
             checksum.update(compressed.buffer, 0, chunkSize);
 
             if (out.readInt() != (int) checksum.getValue())