Skip to content

Commit 6aca634

Browse files
committed
Revert "wip"
This reverts commit e109e2c.
1 parent adb529d commit 6aca634

3 files changed

Lines changed: 31 additions & 1207 deletions

File tree

flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,8 @@ private static ArrowMessage frame(BufferAllocator allocator, final InputStream s
312312
case APP_METADATA_TAG:
313313
{
314314
int size = readRawVarint32(stream);
315-
if (ENABLE_ZERO_COPY_READ) {
316-
appMetadata = GetReadableBuffer.readWithOwnershipTransfer(allocator, stream, size);
317-
} else {
318-
appMetadata = allocator.buffer(size);
319-
GetReadableBuffer.readIntoBuffer(stream, appMetadata, size, false);
320-
}
315+
appMetadata = allocator.buffer(size);
316+
GetReadableBuffer.readIntoBuffer(stream, appMetadata, size, ENABLE_ZERO_COPY_READ);
321317
break;
322318
}
323319
case BODY_TAG:
@@ -327,12 +323,8 @@ private static ArrowMessage frame(BufferAllocator allocator, final InputStream s
327323
body = null;
328324
}
329325
int size = readRawVarint32(stream);
330-
if (ENABLE_ZERO_COPY_READ) {
331-
body = GetReadableBuffer.readWithOwnershipTransfer(allocator, stream, size);
332-
} else {
333-
body = allocator.buffer(size);
334-
GetReadableBuffer.readIntoBuffer(stream, body, size, false);
335-
}
326+
body = allocator.buffer(size);
327+
GetReadableBuffer.readIntoBuffer(stream, body, size, ENABLE_ZERO_COPY_READ);
336328
break;
337329

338330
default:

0 commit comments

Comments
 (0)