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:14:00 UTC
[12/12] arrow git commit: ARROW-1109: [JAVA] transferOwnership fails
when readerIndex is not 0
ARROW-1109: [JAVA] transferOwnership fails when readerIndex is not 0
Closes #745
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/0e680f01
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/0e680f01
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/0e680f01
Branch: refs/heads/master
Commit: 0e680f01c8035ded17496a369cafebfec9968392
Parents: 06c26a2
Author: Julien Le Dem <ju...@apache.org>
Authored: Tue Apr 11 09:40:09 2017 -0700
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sun Jun 11 11:13:25 2017 -0400
----------------------------------------------------------------------
.../src/main/java/io/netty/buffer/ArrowBuf.java | 29 ++++++++++----------
1 file changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/0e680f01/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 06272a7..0328a16 100644
--- a/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java
+++ b/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java
@@ -18,19 +18,6 @@
package io.netty.buffer;
-import com.google.common.base.Preconditions;
-
-import io.netty.util.internal.PlatformDependent;
-
-import org.apache.arrow.memory.AllocationManager.BufferLedger;
-import org.apache.arrow.memory.ArrowByteBufAllocator;
-import org.apache.arrow.memory.BaseAllocator;
-import org.apache.arrow.memory.BaseAllocator.Verbosity;
-import org.apache.arrow.memory.BoundsChecking;
-import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.memory.BufferManager;
-import org.apache.arrow.memory.util.HistoricalLog;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -42,6 +29,19 @@ import java.nio.charset.Charset;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.arrow.memory.AllocationManager.BufferLedger;
+import org.apache.arrow.memory.ArrowByteBufAllocator;
+import org.apache.arrow.memory.BaseAllocator;
+import org.apache.arrow.memory.BaseAllocator.Verbosity;
+import org.apache.arrow.memory.BoundsChecking;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.BufferManager;
+import org.apache.arrow.memory.util.HistoricalLog;
+
+import com.google.common.base.Preconditions;
+
+import io.netty.util.internal.PlatformDependent;
+
public final class ArrowBuf extends AbstractByteBuf implements AutoCloseable {
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ArrowBuf.class);
@@ -245,8 +245,7 @@ public final class ArrowBuf extends AbstractByteBuf implements AutoCloseable {
final BufferLedger otherLedger = this.ledger.getLedgerForAllocator(target);
final ArrowBuf newBuf = otherLedger.newArrowBuf(offset, length, null);
- newBuf.readerIndex(this.readerIndex);
- newBuf.writerIndex(this.writerIndex);
+ newBuf.setIndex(this.readerIndex, this.writerIndex);
final boolean allocationFit = this.ledger.transferBalance(otherLedger);
return new TransferResult(allocationFit, newBuf);
}