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 65EE174BF for ; Thu, 4 Aug 2011 01:21:13 +0000 (UTC) Received: (qmail 37417 invoked by uid 500); 4 Aug 2011 01:21:13 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 37343 invoked by uid 500); 4 Aug 2011 01:21:12 -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 37334 invoked by uid 99); 4 Aug 2011 01:21:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Aug 2011 01:21:12 +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; Thu, 04 Aug 2011 01:21:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7916238885D for ; Thu, 4 Aug 2011 01:20:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153718 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java Date: Thu, 04 Aug 2011 01:20:50 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110804012050.D7916238885D@eris.apache.org> Author: tedyu Date: Thu Aug 4 01:20:49 2011 New Revision: 1153718 URL: http://svn.apache.org/viewvc?rev=1153718&view=rev Log: HBASE-3857 Fix TestHFileBlock.testBlockHeapSize test failure (Mikhail) Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1153718&r1=1153717&r2=1153718&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Thu Aug 4 01:20:49 2011 @@ -184,6 +184,7 @@ Release 0.91.0 - Unreleased HBASE-4032 HBASE-451 improperly breaks public API HRegionInfo#getTableDesc HBASE-4148 HFileOutputFormat doesn't fill in TIMERANGE_KEY metadata (Jonathan Hsieh) HBASE-4003 Cleanup Calls Conservatively On Timeout (Karthick) + HBASE-3857 Fix TestHFileBlock.testBlockHeapSize test failure (Mikhail) IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java?rev=1153718&r1=1153717&r2=1153718&view=diff ============================================================================== --- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java (original) +++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java Thu Aug 4 01:20:49 2011 @@ -482,12 +482,16 @@ public class TestHFileBlock { @Test public void testBlockHeapSize() { + // We have seen multiple possible values for this estimate of the heap size + // of a ByteBuffer, presumably depending on the JDK version. + assertTrue(HFileBlock.BYTE_BUFFER_HEAP_SIZE == 64 || + HFileBlock.BYTE_BUFFER_HEAP_SIZE == 80); + for (int size : new int[] { 100, 256, 12345 }) { byte[] byteArr = new byte[HFileBlock.HEADER_SIZE + size]; ByteBuffer buf = ByteBuffer.wrap(byteArr, 0, size); HFileBlock block = new HFileBlock(BlockType.DATA, size, size, -1, buf, true, -1); - assertEquals(80, HFileBlock.BYTE_BUFFER_HEAP_SIZE); long expected = ClassSize.align(ClassSize.estimateBase(HFileBlock.class, true) + ClassSize.estimateBase(buf.getClass(), true)