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 <[email protected]> Authored: Fri Nov 27 09:30:23 2015 +0100 Committer: Robert Stupp <[email protected]> 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; }
