cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 26 May 2015 05:30:36 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 28afa1c27b48b664534576277a88cf6b90c8fe33
Parents: d85bf4a f3ca368
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Tue May 26 01:29:06 2015 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Tue May 26 01:29:06 2015 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28afa1c2/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 3941c48,ce98a13..93b76bd
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -190,8 -185,8 +190,8 @@@ public class Scrubber implements Closea
                                  ByteBufferUtil.bytesToHex(key.getKey()), ByteBufferUtil.bytesToHex(currentIndexKey))));
                      }
  
 -                    if (dataSize > dataFile.length())
 -                        throw new IOError(new IOException("Impossible row size (greater
than file length): " + dataSize));
 +                    if (dataSizeFromIndex > dataFile.length())
-                         throw new IOError(new IOException("Impossible row size " + dataSizeFromIndex));
++                        throw new IOError(new IOException("Impossible row size (greater
than file length): " + dataSizeFromIndex));
  
                      if (dataStart != dataStartFromIndex)
                          outputHandler.warn(String.format("Data file row position %d differs
from index file row position %d", dataStart, dataStartFromIndex));


Mime
View raw message