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 E800D4119 for ; Wed, 25 May 2011 18:45:27 +0000 (UTC) Received: (qmail 49109 invoked by uid 500); 25 May 2011 18:45:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49085 invoked by uid 500); 25 May 2011 18:45:27 -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 49077 invoked by uid 99); 25 May 2011 18:45:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2011 18:45:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 25 May 2011 18:45:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20C0523888E4; Wed, 25 May 2011 18:45:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1127625 - /cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Date: Wed, 25 May 2011 18:45:04 -0000 To: commits@cassandra.apache.org From: brandonwilliams@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110525184504.20C0523888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brandonwilliams Date: Wed May 25 18:45:03 2011 New Revision: 1127625 URL: http://svn.apache.org/viewvc?rev=1127625&view=rev Log: Fix setting of timestamps and remove extra mutation in pig. Patch by brandonwilliams, reviewed by Jeremy Hanna for CASSANDRA-2706 Modified: cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Modified: cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java?rev=1127625&r1=1127624&r2=1127625&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java (original) +++ cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Wed May 25 18:45:03 2011 @@ -361,14 +361,14 @@ public class CassandraStorage extends Lo org.apache.cassandra.thrift.Column column = new org.apache.cassandra.thrift.Column(); column.name = objToBB(subcol.get(0)); column.value = objToBB(subcol.get(1)); - column.timestamp = System.currentTimeMillis() * 1000; + column.setTimestamp(System.currentTimeMillis() * 1000); columns.add(column); } if (columns.isEmpty()) // a deletion { mutation.deletion = new org.apache.cassandra.thrift.Deletion(); mutation.deletion.super_column = objToBB(pair.get(0)); - mutation.deletion.timestamp = System.currentTimeMillis() * 1000; + mutation.deletion.setTimestamp(System.currentTimeMillis() * 1000); } else { @@ -384,7 +384,7 @@ public class CassandraStorage extends Lo mutation.deletion = new org.apache.cassandra.thrift.Deletion(); mutation.deletion.predicate = new org.apache.cassandra.thrift.SlicePredicate(); mutation.deletion.predicate.column_names = Arrays.asList(objToBB(pair.get(0))); - mutation.deletion.timestamp = System.currentTimeMillis() * 1000; + mutation.deletion.setTimestamp(System.currentTimeMillis() * 1000); } else { @@ -398,10 +398,9 @@ public class CassandraStorage extends Lo column.value = marshallers.get(1).decompose(pair.get(1)); else column.value = validators.get(column.name).decompose(pair.get(1)); - column.timestamp = System.currentTimeMillis() * 1000; + column.setTimestamp(System.currentTimeMillis() * 1000); mutation.column_or_supercolumn = new ColumnOrSuperColumn(); mutation.column_or_supercolumn.column = column; - mutationList.add(mutation); } } mutationList.add(mutation);