Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 46061 invoked from network); 14 Dec 2009 22:38:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Dec 2009 22:38:24 -0000 Received: (qmail 88505 invoked by uid 500); 14 Dec 2009 22:38:24 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 88491 invoked by uid 500); 14 Dec 2009 22:38:23 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 88481 invoked by uid 99); 14 Dec 2009 22:38:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 22:38:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 22:38:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 754012388A84; Mon, 14 Dec 2009 22:38:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r890514 - /incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java Date: Mon, 14 Dec 2009 22:38:01 -0000 To: cassandra-commits@incubator.apache.org From: eevans@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091214223801.754012388A84@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eevans Date: Mon Dec 14 22:38:01 2009 New Revision: 890514 URL: http://svn.apache.org/viewvc?rev=890514&view=rev Log: do trivial arithmetic correctly Patch by eevans; reviewed by Ramzi Rabah for CASSANDRA-618 Modified: incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java Modified: incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=890514&r1=890513&r2=890514&view=diff ============================================================================== --- incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java (original) +++ incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/tools/SSTableImport.java Mon Dec 14 22:38:01 2009 @@ -115,7 +115,7 @@ } SuperColumn superColumn = (SuperColumn)cfamily.getColumn(superName); - superColumn.markForDeleteAt((int)System.currentTimeMillis(), deletedAt); + superColumn.markForDeleteAt((int)(System.currentTimeMillis()/1000), deletedAt); } }