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 14DCE98D3 for ; Fri, 5 Oct 2012 18:21:02 +0000 (UTC) Received: (qmail 74628 invoked by uid 500); 5 Oct 2012 18:21:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74597 invoked by uid 500); 5 Oct 2012 18:21:01 -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 74589 invoked by uid 99); 5 Oct 2012 18:21:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 18:21:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9F3B23A86B; Fri, 5 Oct 2012 18:21:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix incorrect call of serializedSize Message-Id: <20121005182101.9F3B23A86B@tyr.zones.apache.org> Date: Fri, 5 Oct 2012 18:21:01 +0000 (UTC) Updated Branches: refs/heads/trunk 11f7d7253 -> 074f4befa Fix incorrect call of serializedSize Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/074f4bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/074f4bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/074f4bef Branch: refs/heads/trunk Commit: 074f4befaa0e5b7a7a3bf8dbaabdc3388ff61f8e Parents: 11f7d72 Author: Yuki Morishita Authored: Fri Oct 5 13:20:19 2012 -0500 Committer: Yuki Morishita Committed: Fri Oct 5 13:20:19 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/RangeTombstone.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/074f4bef/src/java/org/apache/cassandra/db/RangeTombstone.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeTombstone.java b/src/java/org/apache/cassandra/db/RangeTombstone.java index b8ff027..1b85c59 100644 --- a/src/java/org/apache/cassandra/db/RangeTombstone.java +++ b/src/java/org/apache/cassandra/db/RangeTombstone.java @@ -170,10 +170,9 @@ public class RangeTombstone extends Interval implement toWrite.add(tombstone); } - TypeSizes typeSizes = TypeSizes.NATIVE; for (RangeTombstone tombstone : toWrite) { - size += tombstone.serializedSize(typeSizes); + size += tombstone.serializedSizeForSSTable(); atomCount++; if (out != null) atomSerializer.serializeForSSTable(tombstone, out);