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 BA3DBFA79 for ; Mon, 25 Mar 2013 19:21:23 +0000 (UTC) Received: (qmail 91597 invoked by uid 500); 25 Mar 2013 19:21:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91554 invoked by uid 500); 25 Mar 2013 19:21:22 -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 91323 invoked by uid 99); 25 Mar 2013 19:21:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Mar 2013 19:21:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3873C820186; Mon, 25 Mar 2013 19:21:22 +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: Mon, 25 Mar 2013 19:21:27 -0000 Message-Id: <658cf121899742a38355c01d800c0247@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] git commit: Fix bad default for min/max timestamp in SSTableMetadata Fix bad default for min/max timestamp in SSTableMetadata patch by slebresne; reviewed by jasobrown for CASSANDRA-5372 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04397241 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04397241 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04397241 Branch: refs/heads/trunk Commit: 043972417976cd1947d02d3da21437ae73fdac56 Parents: 381fe75 Author: Sylvain Lebresne Authored: Mon Mar 25 15:25:08 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 25 20:12:36 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableMetadata.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04397241/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4c7fdb4..dfeb19e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -39,6 +39,7 @@ (CASSANDRA-4937) Merged from 1.1: * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) 1.2.3 http://git-wip-us.apache.org/repos/asf/cassandra/blob/04397241/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 28a6485..e38e091 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -410,9 +410,7 @@ public class SSTableMetadata replayPosition = ReplayPosition.NONE; } long minTimestamp = desc.version.tracksMinTimestamp ? dis.readLong() : Long.MIN_VALUE; - if (!desc.version.tracksMinTimestamp) - minTimestamp = Long.MAX_VALUE; - long maxTimestamp = desc.version.containsTimestamp() ? dis.readLong() : Long.MIN_VALUE; + long maxTimestamp = desc.version.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE; if (!desc.version.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp maxTimestamp = Long.MAX_VALUE; int maxLocalDeletionTime = desc.version.tracksMaxLocalDeletionTime ? dis.readInt() : Integer.MAX_VALUE;