Upgrade arrow to 16.0.0

This reverts commit 5de7b98.
apache · Dec 30, 2024 · 91bb63f · 91bb63f
1 parent 62b2183
commit 91bb63f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCopyLocalJars.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCopyLocalJars.java
@@ -66,7 +66,7 @@ public Void call() throws Exception {
         io.netty.handler.codec.http.HttpObjectAggregator.class, //
         org.apache.arrow.vector.types.pojo.ArrowType.class, //arrow-vector
         org.apache.arrow.memory.RootAllocator.class, //arrow-memory
-        org.apache.arrow.memory.NettyAllocationManager.class, //arrow-memory-netty
+        org.apache.arrow.memory.netty.NettyAllocationManager.class, //arrow-memory-netty
         io.netty.handler.codec.http.HttpObjectAggregator.class, // netty-all
         org.apache.arrow.flatbuf.Schema.class, //arrow-format
         com.google.flatbuffers.Table.class, //flatbuffers

diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
     <antlr4.version>4.9.3</antlr4.version>
     <apache-directory-server.version>1.5.7</apache-directory-server.version>
     <!-- Include arrow for LlapOutputFormatService -->
-    <arrow.version>12.0.0</arrow.version>
+    <arrow.version>16.0.0</arrow.version>
     <avatica.version>1.12.0</avatica.version>
     <avro.version>1.11.4</avro.version>
     <bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>

diff --git a/ql/src/java/org/apache/hadoop/hive/llap/WritableByteChannelAdapter.java b/ql/src/java/org/apache/hadoop/hive/llap/WritableByteChannelAdapter.java
@@ -25,7 +25,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 import java.util.concurrent.Semaphore;
-import org.apache.arrow.memory.ArrowByteBufAllocator;
+import org.apache.arrow.memory.patch.ArrowByteBufAllocator;
 import org.apache.arrow.memory.BufferAllocator;
 
 import org.slf4j.Logger;