You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/11/27 09:31:54 UTC
[1/5] cassandra git commit: DeletionTime.compareTo wrong in rare cases
Repository: cassandra
Updated Branches:
refs/heads/trunk b3ff13243 -> 1c5238c1f
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/trunk
Commit: b8a8004d833e16d71be416e8cb5bb8541c81fc12
Parents: b5b9f71
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 09:28:38 2015 +0100
Committer: Robert Stupp <sn...@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;
}
[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8091d5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8091d5f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8091d5f
Branch: refs/heads/trunk
Commit: e8091d5f72ca1d19872201c3a672f3afd5c1d0c5
Parents: 489d647 db97083
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 09:30:23 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 09:30:45 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DeletionTime.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8091d5f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 729264c,8779275..bc183fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,7 -5,16 +17,8 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * 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/e8091d5f/src/java/org/apache/cassandra/db/DeletionTime.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/DeletionTime.java
index 919c603,99cfe35..652689c
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@@ -23,16 -23,15 +23,15 @@@ import java.security.MessageDigest
import com.google.common.base.Objects;
import org.apache.cassandra.cache.IMeasurableMemory;
+import org.apache.cassandra.db.rows.Cell;
import org.apache.cassandra.io.ISerializer;
+import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
--import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.ObjectSizes;
-import org.codehaus.jackson.annotate.JsonIgnore;
/**
- * A top-level (row) tombstone.
+ * Information on deletion of a storage engine object.
*/
public class DeletionTime implements Comparable<DeletionTime>, IMeasurableMemory
{
@@@ -112,14 -96,14 +111,14 @@@
public int compareTo(DeletionTime dt)
{
- if (markedForDeleteAt < dt.markedForDeleteAt)
+ if (markedForDeleteAt() < dt.markedForDeleteAt())
return -1;
- else if (markedForDeleteAt > dt.markedForDeleteAt)
+ else if (markedForDeleteAt() > dt.markedForDeleteAt())
return 1;
- else if (localDeletionTime < dt.localDeletionTime)
+ else if (localDeletionTime() < dt.localDeletionTime())
return -1;
- else if (localDeletionTime > dt.localDeletionTime)
+ else if (localDeletionTime() > dt.localDeletionTime())
- return -1;
+ return 1;
else
return 0;
}
[5/5] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.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/1c5238c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c5238c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c5238c1
Branch: refs/heads/trunk
Commit: 1c5238c1f05264637f7e0d93309e539e1e69424f
Parents: b3ff132 29178b2
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 09:31:03 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 09:31:03 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DeletionTime.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c5238c1/CHANGES.txt
----------------------------------------------------------------------
[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sn...@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/db970837
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db970837
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db970837
Branch: refs/heads/trunk
Commit: db97083764e08755fcce7e74c1c81f081db48e3f
Parents: 53e777a b8a8004
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 09:29:06 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 09:29:06 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/db970837/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 361bbf6,48f4e89..8779275
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.1.12
+2.2.4
+ * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
+ * Fix JSON update with prepared statements (CASSANDRA-10631)
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * 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)
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29178b2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29178b2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29178b2f
Branch: refs/heads/trunk
Commit: 29178b2fe4881a46708bd03017fff050ac6af287
Parents: c29279c e8091d5
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Nov 27 09:30:57 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Nov 27 09:30:57 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DeletionTime.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29178b2f/CHANGES.txt
----------------------------------------------------------------------