cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: DeletionTime.compareTo wrong in rare cases
Date Fri, 27 Nov 2015 08:31:30 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b5b9f7106 -> b8a8004d8


DeletionTime.compareTo wrong in rare cases

patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10749


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8a8004d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8a8004d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8a8004d

Branch: refs/heads/cassandra-2.1
Commit: b8a8004d833e16d71be416e8cb5bb8541c81fc12
Parents: b5b9f71
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Nov 27 09:28:38 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Nov 27 09:28:38 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        | 1 +
 src/java/org/apache/cassandra/db/DeletionTime.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8a8004d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ee0bc61..48f4e89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)
  * Force encoding when computing statement ids (CASSANDRA-10755)
  * Properly reject counters as map keys (CASSANDRA-10760)
  * Fix the sstable-needs-cleanup check (CASSANDRA-10740)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8a8004d/src/java/org/apache/cassandra/db/DeletionTime.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java b/src/java/org/apache/cassandra/db/DeletionTime.java
index 7165417..99cfe35 100644
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@ -103,7 +103,7 @@ public class DeletionTime implements Comparable<DeletionTime>, IMeasurableMemory
         else if (localDeletionTime < dt.localDeletionTime)
             return -1;
         else if (localDeletionTime > dt.localDeletionTime)
-            return -1;
+            return 1;
         else
             return 0;
     }


Mime
View raw message