Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D71418EE6 for ; Wed, 3 Feb 2016 11:14:56 +0000 (UTC) Received: (qmail 21588 invoked by uid 500); 3 Feb 2016 11:14:44 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21555 invoked by uid 500); 3 Feb 2016 11:14:44 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 21531 invoked by uid 99); 3 Feb 2016 11:14:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2016 11:14:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8B85FDFC8F; Wed, 3 Feb 2016 11:14:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 03 Feb 2016 11:14:44 -0000 Message-Id: <2d088dd43a66440b8f68c840342f0902@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/10] cassandra git commit: Add comment on DateType explaining that its kept only for backward compatibility Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 af2b85842 -> 3ec7d8c05 refs/heads/cassandra-3.0 f51e98399 -> 8cb5a20c6 refs/heads/cassandra-3.3 c5feeda6a -> 35a7194e7 refs/heads/trunk eef0ddfab -> f1f52e7bb Add comment on DateType explaining that its kept only for backward compatibility Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ec7d8c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ec7d8c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ec7d8c0 Branch: refs/heads/cassandra-2.2 Commit: 3ec7d8c056c71b3032b1ca1d1fd07462c5091900 Parents: af2b858 Author: Sylvain Lebresne Authored: Wed Feb 3 12:08:13 2016 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 3 12:08:13 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++ src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/DateType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java index 82ed876..5186ca8 100644 --- a/src/java/org/apache/cassandra/db/marshal/DateType.java +++ b/src/java/org/apache/cassandra/db/marshal/DateType.java @@ -31,6 +31,11 @@ import org.apache.cassandra.serializers.TimestampSerializer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; +/** + * This is the old version of TimestampType, but has been replaced as it wasn't comparing pre-epoch timestamps + * correctly. This is kept for backward compatibility but shouldn't be used in new code. + */ +@Deprecated public class DateType extends AbstractType { private static final Logger logger = LoggerFactory.getLogger(DateType.class); http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/TimeType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java index c241a38..86de574 100644 --- a/src/java/org/apache/cassandra/db/marshal/TimeType.java +++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java @@ -52,12 +52,6 @@ public class TimeType extends AbstractType } @Override - public boolean isCompatibleWith(AbstractType previous) - { - return super.isCompatibleWith(previous); - } - - @Override public boolean isValueCompatibleWithInternal(AbstractType otherType) { return this == otherType || otherType == LongType.instance;