http://git-wip-us.apache.org/repos/asf/hive/blob/2334a0dd/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/ArrowWrapperWritable.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/ArrowWrapperWritable.java b/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/ArrowWrapperWritable.java index df7b53f..dd490b1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/ArrowWrapperWritable.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/ArrowWrapperWritable.java @@ -15,26 +15,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.hadoop.hive.ql.io.arrow; import org.apache.arrow.vector.VectorSchemaRoot; -import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.WritableComparable; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -public class ArrowWrapperWritable implements Writable { +public class ArrowWrapperWritable implements WritableComparable { private VectorSchemaRoot vectorSchemaRoot; public ArrowWrapperWritable(VectorSchemaRoot vectorSchemaRoot) { this.vectorSchemaRoot = vectorSchemaRoot; } + public ArrowWrapperWritable() {} public VectorSchemaRoot getVectorSchemaRoot() { return vectorSchemaRoot; } + public void setVectorSchemaRoot(VectorSchemaRoot vectorSchemaRoot) { + this.vectorSchemaRoot = vectorSchemaRoot; + } + @Override public void write(DataOutput dataOutput) throws IOException { throw new UnsupportedOperationException(); @@ -44,4 +50,12 @@ public class ArrowWrapperWritable implements Writable { public void readFields(DataInput dataInput) throws IOException { throw new UnsupportedOperationException(); } + + @Override public int compareTo(Object o) { + return 0; + } + + @Override public boolean equals(Object o) { + return true; + } }
http://git-wip-us.apache.org/repos/asf/hive/blob/2334a0dd/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/RootAllocatorFactory.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/RootAllocatorFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/RootAllocatorFactory.java index 78cc188..7aa732b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/RootAllocatorFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/arrow/RootAllocatorFactory.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.hadoop.hive.ql.io.arrow; import org.apache.arrow.memory.RootAllocator; @@ -41,4 +42,12 @@ public enum RootAllocatorFactory { } return rootAllocator; } + + //arrowAllocatorLimit is ignored if an allocator was previously created + public synchronized RootAllocator getOrCreateRootAllocator(long arrowAllocatorLimit) { + if (rootAllocator == null) { + rootAllocator = new RootAllocator(arrowAllocatorLimit); + } + return rootAllocator; + } } http://git-wip-us.apache.org/repos/asf/hive/blob/2334a0dd/ql/src/test/org/apache/hadoop/hive/llap/TestLlapOutputFormat.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/llap/TestLlapOutputFormat.java b/ql/src/test/org/apache/hadoop/hive/llap/TestLlapOutputFormat.java index 13a3070..f27cdf4 100644 --- a/ql/src/test/org/apache/hadoop/hive/llap/TestLlapOutputFormat.java +++ b/ql/src/test/org/apache/hadoop/hive/llap/TestLlapOutputFormat.java @@ -54,6 +54,7 @@ public class TestLlapOutputFormat { Configuration conf = new Configuration(); // Pick random avail port HiveConf.setIntVar(conf, HiveConf.ConfVars.LLAP_DAEMON_OUTPUT_SERVICE_PORT, 0); + HiveConf.setBoolVar(conf, HiveConf.ConfVars.LLAP_OUTPUT_FORMAT_ARROW, false); LlapOutputFormatService.initializeAndStart(conf, null); service = LlapOutputFormatService.get(); LlapProxy.setDaemon(true);
