Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 33446 invoked from network); 16 Oct 2010 16:25:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Oct 2010 16:25:48 -0000 Received: (qmail 63803 invoked by uid 500); 16 Oct 2010 16:25:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63775 invoked by uid 500); 16 Oct 2010 16:25:48 -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 63767 invoked by uid 99); 16 Oct 2010 16:25:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Oct 2010 16:25:48 +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; Sat, 16 Oct 2010 16:25:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 15F2323888EA; Sat, 16 Oct 2010 16:24:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1023326 - /cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Date: Sat, 16 Oct 2010 16:24:49 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101016162449.15F2323888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Sat Oct 16 16:24:48 2010 New Revision: 1023326 URL: http://svn.apache.org/viewvc?rev=1023326&view=rev Log: rename dataPosition -> rowPosition. patch by jbellis Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1023326&r1=1023325&r2=1023326&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Sat Oct 16 16:24:48 2010 @@ -275,14 +275,14 @@ public class SSTableWriter extends SSTab try { DecoratedKey key; - long dataPosition = 0; - while (dataPosition < dfile.length()) + long rowPosition = 0; + while (rowPosition < dfile.length()) { key = SSTableReader.decodeKey(StorageService.getPartitioner(), desc, FBUtilities.readShortByteArray(dfile)); long dataSize = SSTableReader.readRowSize(dfile, desc); - iwriter.afterAppend(key, dataPosition); - dataPosition = dfile.getFilePointer() + dataSize; - dfile.seek(dataPosition); + iwriter.afterAppend(key, rowPosition); + rowPosition = dfile.getFilePointer() + dataSize; + dfile.seek(rowPosition); rows++; } }