Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 8FB3D4912 for ; Sun, 29 May 2011 17:02:33 +0000 (UTC) Received: (qmail 47855 invoked by uid 500); 29 May 2011 17:02:33 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 47804 invoked by uid 500); 29 May 2011 17:02:32 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 47792 invoked by uid 99); 29 May 2011 17:02:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 May 2011 17:02:32 +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; Sun, 29 May 2011 17:02:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9695B23888C2; Sun, 29 May 2011 17:02:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128905 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java Date: Sun, 29 May 2011 17:02:11 -0000 To: commits@hbase.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110529170211.9695B23888C2@eris.apache.org> Author: apurtell Date: Sun May 29 17:02:11 2011 New Revision: 1128905 URL: http://svn.apache.org/viewvc?rev=1128905&view=rev Log: HBASE-3921 Allow adding arbitrary blobs to Put; fix TestHeapSize Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java?rev=1128905&r1=1128904&r2=1128905&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java Sun May 29 17:02:11 2011 @@ -62,7 +62,7 @@ public class Put implements HeapSize, Wr private Map attributes; private static final long OVERHEAD = ClassSize.align( - ClassSize.OBJECT + ClassSize.REFERENCE + + ClassSize.OBJECT + 2 * ClassSize.REFERENCE + 2 * Bytes.SIZEOF_LONG + Bytes.SIZEOF_BOOLEAN + ClassSize.REFERENCE + ClassSize.TREEMAP); @@ -527,6 +527,13 @@ public class Put implements HeapSize, Wr heapsize += kv.heapSize(); } } + if (attributes != null) { + heapsize += ClassSize.align(this.attributes.size() * ClassSize.MAP_ENTRY); + for(Map.Entry> entry : this.familyMap.entrySet()) { + heapsize += ClassSize.align(ClassSize.STRING + entry.getKey().length); + heapsize += ClassSize.align(ClassSize.ARRAY + entry.getValue().size()); + } + } return ClassSize.align((int)heapsize); }