Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bd08aee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bd08aee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bd08aee Branch: refs/heads/trunk Commit: 6bd08aee969e9ce4e99f01cb509ca63575a0fd08 Parents: 7f855d1 5a571c6 Author: Dave Brosius <[email protected]> Authored: Tue May 26 00:48:28 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue May 26 00:48:28 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/6bd08aee/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java index ec0532c,ea10855..9143c8b --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@@ -186,13 -196,13 +186,13 @@@ public class Scrubber implements Closea } if (dataSize > dataFile.length()) - throw new IOError(new IOException("Impossible row size (greater than file length): " + dataSize)); + throw new IOError(new IOException("Impossible row size " + dataSize)); if (dataStart != dataStartFromIndex) - outputHandler.warn(String.format("Data file row position %d different from index file row position %d", dataStart, dataSizeFromIndex)); + outputHandler.warn(String.format("Data file row position %d differs from index file row position %d", dataStart, dataStartFromIndex)); if (dataSize != dataSizeFromIndex) - outputHandler.warn(String.format("Data file row size %d differs from index file row size %d", dataSize, dataSizeFromIndex)); + outputHandler.warn(String.format("Data file row size %d different from index file row size %d", dataSize, dataSizeFromIndex)); SSTableIdentityIterator atoms = new SSTableIdentityIterator(sstable, dataFile, key, dataSize, validateColumns); if (prevKey != null && prevKey.compareTo(key) > 0)
