Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 d85bf4a02 -> 28afa1c27
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/cassandra-2.2 Commit: f3ca3686d669c6423384dc8be2b896b1d252f851 Parents: 6bd08ae Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue May 26 01:14:01 2015 -0400 Committer: Dave Brosius <dbros...@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));
