You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/06/11 15:13:53 UTC
[05/12] arrow git commit: ARROW-1108: [JAVA] Check if ArrowBuf is
empty buffer in getActualConsumedMemory() and getPossibleConsumedMemory()
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/06c26a2c
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/06c26a2c
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/06c26a2c
Branch: refs/heads/master
Commit: 06c26a2cd6d361a2df84e5ab4146c83513d3ee46
Parents: ae6142d
Author: Steven Phillips <st...@dremio.com>
Authored: Mon Mar 27 14:24:01 2017 -0700
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sun Jun 11 11:13:25 2017 -0400
----------------------------------------------------------------------
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/06c26a2c/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();
}