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 06:50:32 UTC
[1/4] cassandra git commit: fix wrong variable in warning message
Repository: cassandra
Updated Branches:
refs/heads/trunk 7f383006f -> 419bedc61
fix wrong variable in warning message
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a571c62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a571c62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a571c62
Branch: refs/heads/trunk
Commit: 5a571c6291678d7f92c120d1f9b366374e51c07d
Parents: be9eff5
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 26 00:42:58 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 26 00:42:58 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/5a571c62/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 e5bcd25..ea10855 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -199,7 +199,7 @@ public class Scrubber implements Closeable
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, 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));
[3/4] 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/587b654e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/587b654e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/587b654e
Branch: refs/heads/trunk
Commit: 587b654ed32c93dbe5b365a35b0be1b326780d98
Parents: bb1f131 6bd08ae
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 26 00:49:23 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 26 00:49:23 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/587b654e/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by db...@apache.org.
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 <db...@mebigfatguy.com>
Authored: Tue May 26 00:48:28 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
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)
[4/4] 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/419bedc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/419bedc6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/419bedc6
Branch: refs/heads/trunk
Commit: 419bedc617b52852da24ec71af41c99fe8d98f6c
Parents: 7f38300 587b654
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 26 00:50:20 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 26 00:50:20 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------