Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A7F7200C8E for ; Fri, 9 Jun 2017 00:00:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 892DB160BEA; Thu, 8 Jun 2017 22:00:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2814160BC3 for ; Fri, 9 Jun 2017 00:00:03 +0200 (CEST) Received: (qmail 93482 invoked by uid 500); 8 Jun 2017 22:00:03 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 93471 invoked by uid 99); 8 Jun 2017 22:00:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2017 22:00:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 013B1E00C4; Thu, 8 Jun 2017 22:00:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smp@apache.org To: commits@arrow.apache.org Date: Thu, 08 Jun 2017 22:00:02 -0000 Message-Id: In-Reply-To: <4228425aaba645c49a3215f7779f9af4@git.apache.org> References: <4228425aaba645c49a3215f7779f9af4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] arrow git commit: ARROW-1108: [JAVA] Check if ArrowBuf is empty buffer in getActualConsumedMemory() and getPossibleConsumedMemory() archived-at: Thu, 08 Jun 2017 22:00:04 -0000 ARROW-1108: [JAVA] Check if ArrowBuf is empty buffer in getActualConsumedMemory() and getPossibleConsumedMemory() Closes #744 Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/6d71b8c4 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/6d71b8c4 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/6d71b8c4 Branch: refs/heads/master Commit: 6d71b8c44d5af72a0c8dab79fc16718e21d5ee8d Parents: 6c3024b Author: Steven Phillips Authored: Mon Mar 27 14:24:01 2017 -0700 Committer: Steven Phillips Committed: Thu Jun 8 14:57:45 2017 -0700 ---------------------------------------------------------------------- java/memory/src/main/java/io/netty/buffer/ArrowBuf.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/6d71b8c4/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java ---------------------------------------------------------------------- diff --git a/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java b/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java index e777b5a..06272a7 100644 --- a/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java +++ b/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java @@ -796,6 +796,9 @@ public final class ArrowBuf extends AbstractByteBuf implements AutoCloseable { * @return Size in bytes. */ public int getPossibleMemoryConsumed() { + if (isEmpty) { + return 0; + } return ledger.getSize(); } @@ -807,6 +810,9 @@ public final class ArrowBuf extends AbstractByteBuf implements AutoCloseable { * @return Size in bytes. */ public int getActualMemoryConsumed() { + if (isEmpty) { + return 0; + } return ledger.getAccountedSize(); }