mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 00:56:31 +08:00
Code Activity

Fix minor build errors

Browse Source
This commit is contained in:
Yurui Zhou committed 2019-06-06 15:12:01 +08:00
1 parent e0d9c1f296
commit 1c0e0b2a5f
4 files changed
+29 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/adapter/orc/pom.xml
+6
View File
@@ -27,6 +27,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-format</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<parent>
java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java
+2 -1
View File
@@ -17,10 +17,11 @@
package org.apache.arrow.adapter.orc;
import java.io.IOException;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.ipc.ArrowReader;
import java.io.IOException;
public class OrcReader implements AutoCloseable {
java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java
+6 -4
View File
@@ -17,13 +17,14 @@
package org.apache.arrow.adapter.orc;
import io.netty.buffer.ArrowBuf;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.OwnershipTransferResult;
import org.apache.arrow.memory.ReferenceManager;
import org.apache.arrow.util.Preconditions;
import java.util.concurrent.atomic.AtomicInteger;
import io.netty.buffer.ArrowBuf;
public class OrcReferenceManager implements ReferenceManager {
private final AtomicInteger bufRefCnt = new AtomicInteger(0);
@@ -33,6 +34,7 @@ public class OrcReferenceManager implements ReferenceManager {
OrcReferenceManager(OrcMemoryJniWrapper memory) {
this.memory = memory;
}
/**
* Return the reference count.
*
@@ -177,7 +179,7 @@ public class OrcReferenceManager implements ReferenceManager {
}
/**
* Get the buffer allocator associated with this reference manager
* Get the buffer allocator associated with this reference manager.
*
* @return buffer allocator.
*/
@@ -193,7 +195,7 @@ public class OrcReferenceManager implements ReferenceManager {
*/
@Override
public int getSize() {
return memory.getSize();
return (int)memory.getSize();
}
/**
java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java
+15 -7
View File
@@ -17,18 +17,25 @@
package org.apache.arrow.adapter.orc;
import io.netty.buffer.ArrowBuf;
import java.io.IOException;
import java.util.ArrayList;
import java.util.stream.Collectors;
import org.apache.arrow.flatbuf.MessageHeader;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.ipc.ArrowReader;
import org.apache.arrow.vector.ipc.ReadChannel;
import org.apache.arrow.vector.ipc.message.*;
import org.apache.arrow.vector.ipc.message.ArrowDictionaryBatch;
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
import org.apache.arrow.vector.ipc.message.MessageChannelReader;
import org.apache.arrow.vector.ipc.message.MessageResult;
import org.apache.arrow.vector.ipc.message.MessageSerializer;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
import java.io.IOException;
import java.util.ArrayList;
import java.util.stream.Collectors;
import io.netty.buffer.ArrowBuf;
public class OrcStripeReader extends ArrowReader {
private OrcStripeReaderJniWrapper stripeReader;
@@ -53,7 +60,7 @@ public class OrcStripeReader extends ArrowReader {
}
ArrayList<ArrowBuf> buffers = new ArrayList<>();
for(OrcMemoryJniWrapper buffer : recordBatch.buffers) {
for (OrcMemoryJniWrapper buffer : recordBatch.buffers) {
buffers.add(new ArrowBuf(
new OrcReferenceManager(buffer),
null,
@@ -134,7 +141,8 @@ public class OrcStripeReader extends ArrowReader {
}
if (result.getMessage().headerType() != MessageHeader.DictionaryBatch) {
throw new IOException("Expected DictionaryBatch but header was " + result.getMessage().headerType());
throw new IOException("Expected DictionaryBatch but header was " +
result.getMessage().headerType());
}
ArrowBuf bodyBuffer = result.getBodyBuffer();