You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/10/01 19:42:48 UTC
[4/7] git commit: Fix possible overflow while sorting CL segments for
replay patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Fix possible overflow while sorting CL segments for replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c045f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c045f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c045f8
Branch: refs/heads/cassandra-2.1
Commit: 96c045f8576ab35359f33ac81e7bb8c37342aadf
Parents: eed50a9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f71162..efa0806 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 5b8bcfa..45cc77d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -424,7 +424,7 @@ public class CommitLogSegment
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
}