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/26 07:30:35 UTC
[1/3] cassandra git commit: fix bad auto-merge
Repository: cassandra
Updated Branches:
refs/heads/trunk e49567ff8 -> b23e91f82
fix bad auto-merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3ca3686
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ca3686
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3ca3686
Branch: refs/heads/trunk
Commit: f3ca3686d669c6423384dc8be2b896b1d252f851
Parents: 6bd08ae
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 26 01:14:01 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 26 01:14:01 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/f3ca3686/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 9143c8b..ce98a13 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -186,7 +186,7 @@ public class Scrubber implements Closeable
}
if (dataSize > dataFile.length())
- throw new IOError(new IOException("Impossible row size " + dataSize));
+ throw new IOError(new IOException("Impossible row size (greater than file length): " + dataSize));
if (dataStart != dataStartFromIndex)
outputHandler.warn(String.format("Data file row position %d differs from index file row position %d", dataStart, dataStartFromIndex));
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by db...@apache.org.
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 <db...@mebigfatguy.com>
Authored: Tue May 26 01:29:06 2015 -0400
Committer: Dave Brosius <db...@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));
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b23e91f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b23e91f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b23e91f8
Branch: refs/heads/trunk
Commit: b23e91f82792a247262e346c27124bf29d29d59d
Parents: e49567f 28afa1c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 26 01:29:52 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 26 01:29:52 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------