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 D26AD10954 for ; Thu, 6 Mar 2014 09:26:59 +0000 (UTC) Received: (qmail 72451 invoked by uid 500); 6 Mar 2014 09:26:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 72432 invoked by uid 500); 6 Mar 2014 09:26:58 -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 72413 invoked by uid 99); 6 Mar 2014 09:26:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 09:26:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 498F5938ACC; Thu, 6 Mar 2014 09:26:56 +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 Message-Id: <795fa24b65904c6ba111f8609e0a24de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix timestamp scaling issue for 6623 Date: Thu, 6 Mar 2014 09:26:56 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 ba95ca0db -> 5ef53e6f7 Fix timestamp scaling issue for 6623 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ef53e6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ef53e6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ef53e6f Branch: refs/heads/cassandra-2.0 Commit: 5ef53e6f7cc64585e93a84311f58fc62b781379d Parents: ba95ca0 Author: Sylvain Lebresne Authored: Thu Mar 6 10:26:20 2014 +0100 Committer: Sylvain Lebresne Committed: Thu Mar 6 10:26:20 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/CQL3CasConditions.java | 3 ++- .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ef53e6f/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java index 194ff0c..668f98f 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java +++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java @@ -43,7 +43,8 @@ public class CQL3CasConditions implements CASConditions public CQL3CasConditions(CFMetaData cfm, long now) { this.cfm = cfm; - this.now = now; + // We will use now for Column.isLive() which expects milliseconds but the argument is in microseconds. + this.now = now / 1000; this.conditions = new TreeMap<>(cfm.comparator); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ef53e6f/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index ecefcb9..154c01c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -534,9 +534,7 @@ public abstract class ModificationStatement implements CQLStatement, MeasurableF ByteBuffer key = keys.get(0); - // It's cleaner to use the query timestamp below, but it's in seconds while the conditions expects microseconds, so just - // put it back in millis (we don't really lose precision because the ultimate consumer, Column.isLive, re-divide it). - CQL3CasConditions conditions = new CQL3CasConditions(cfm, queryState.getTimestamp() * 1000); + CQL3CasConditions conditions = new CQL3CasConditions(cfm, queryState.getTimestamp()); ColumnNameBuilder prefix = createClusteringPrefixBuilder(variables); ColumnFamily updates = UnsortedColumns.factory.create(cfm); addUpdatesAndConditions(key, prefix, updates, conditions, variables, getTimestamp(queryState.getTimestamp(), variables));