You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/05/05 18:21:16 UTC
[1/3] cassandra git commit: Avoid NPE when generating scrub error
message
Repository: cassandra
Updated Branches:
refs/heads/trunk 2096bcefd -> 95638b6e2
Avoid NPE when generating scrub error message
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-9290
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbb36a47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbb36a47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbb36a47
Branch: refs/heads/trunk
Commit: dbb36a476bc502708ee7443e41bba570bfd5633a
Parents: a11bc78
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue May 5 11:18:23 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 5 11:18:23 2015 -0500
----------------------------------------------------------------------
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/dbb36a47/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 1752b21..f04df27 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -187,7 +187,7 @@ public class Scrubber implements Closeable
if (key == null)
throw new IOError(new IOException("Unable to read row key from data file"));
- if (!key.key.equals(currentIndexKey))
+ if (currentIndexKey != null && !key.key.equals(currentIndexKey))
{
throw new IOError(new IOException(String.format("Key from data file (%s) does not match key from index file (%s)",
ByteBufferUtil.bytesToHex(key.key), ByteBufferUtil.bytesToHex(currentIndexKey))));
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/compaction/Scrubber.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bae5a31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bae5a31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bae5a31
Branch: refs/heads/trunk
Commit: 5bae5a313f2ee78d68abbea151c1eff1c2186d64
Parents: 1a0262f dbb36a4
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 5 11:20:49 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 5 11:20:49 2015 -0500
----------------------------------------------------------------------
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/5bae5a31/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 1f5c7de,f04df27..e8814e4
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -177,10 -187,10 +177,10 @@@ public class Scrubber implements Closea
if (key == null)
throw new IOError(new IOException("Unable to read row key from data file"));
- if (!key.getKey().equals(currentIndexKey))
- if (currentIndexKey != null && !key.key.equals(currentIndexKey))
++ if (currentIndexKey != null && !key.getKey().equals(currentIndexKey))
{
throw new IOError(new IOException(String.format("Key from data file (%s) does not match key from index file (%s)",
- ByteBufferUtil.bytesToHex(key.key), ByteBufferUtil.bytesToHex(currentIndexKey))));
+ ByteBufferUtil.bytesToHex(key.getKey()), ByteBufferUtil.bytesToHex(currentIndexKey))));
}
if (dataSize > dataFile.length())
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95638b6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95638b6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95638b6e
Branch: refs/heads/trunk
Commit: 95638b6e285c3926a5643eca29d1ca1cf2725055
Parents: 2096bce 5bae5a3
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 5 11:21:06 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 5 11:21:06 2015 -0500
----------------------------------------------------------------------
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/95638b6e/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------