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/05/03 03:03:01 UTC

cassandra git commit: move field to local

Repository: cassandra
Updated Branches:
  refs/heads/trunk 253ce00a6 -> 6f1e38cc2


move field to local


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

Branch: refs/heads/trunk
Commit: 6f1e38cc2d037017b1fdfdca0fbcfc63f830577c
Parents: 253ce00
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 2 21:02:40 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 2 21:02:40 2015 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 1 -
 src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f1e38cc/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index b136d4b..6f9039d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -22,7 +22,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f1e38cc/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
index 2b59545..a3c4135 100644
--- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
+++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
@@ -99,7 +99,6 @@ public class DataIntegrityMetadata
         private final RandomAccessReader dataReader;
         private final Descriptor descriptor;
         private long storedDigestValue;
-        private long calculatedDigestValue;
 
         public FileDigestValidator(Descriptor descriptor) throws IOException
         {
@@ -126,7 +125,7 @@ public class DataIntegrityMetadata
             byte[] chunk = new byte[64 * 1024];
 
             while( checkedInputStream.read(chunk) > 0 ) { }
-            calculatedDigestValue = checkedInputStream.getChecksum().getValue();
+            long calculatedDigestValue = checkedInputStream.getChecksum().getValue();
             if (storedDigestValue != calculatedDigestValue) {
                 throw new IOException("Corrupted SSTable : " + descriptor.filenameFor(Component.DATA));
             }