Remove uneeded changes.

dremio · Nov 3, 2023 · 662e9f1 · 662e9f1
1 parent 0e3bd9e
commit 662e9f1
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java
@@ -151,11 +151,6 @@ private static void initArrowTypeStruct(ArrowType.Struct structType,
  private static void initArrowTypeList(ArrowType.List listType,
  ArrowType subType,
  GandivaTypes.ExtGandivaType.Builder builder) throws GandivaException {
- /*if (f != null && f.getChildren().size() > 0 && f.getChildren().get(0)
- .getType().getTypeID().getFlatbufID() != Type.List) {
- //builder.setListType(arrowTypeToProtobuf(f.getChildren().get(0).getType(), null));
- builder.setListType(arrowTypeToProtobuf(f.getChildren().get(0).getType(), null, builder).getType());
- }*/
  if (subType != null) {
  builder.setListType(arrowTypeToProtobuf(subType).getType());
  }

diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java
@@ -41,7 +41,6 @@ class FunctionNode implements TreeNode {
  this.retType = inField.getType();
  if (inField.getChildren().size() > 0 && inField.getChildren().get(0)
  .getType().getTypeID().getFlatbufID() != Type.List) {
- //builder.setListType(arrowTypeToProtobuf(f.getChildren().get(0).getType(), null));
  this.retListType = inField.getChildren().get(0).getType();
  } else {
  this.retListType = null;

diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java
@@ -43,7 +43,7 @@ public GandivaTypes.TreeNode toProtobuf() throws GandivaException {
  ifNodeBuilder.setCond(condition.toProtobuf());
  ifNodeBuilder.setThenNode(thenNode.toProtobuf());
  ifNodeBuilder.setElseNode(elseNode.toProtobuf());
- ifNodeBuilder.setReturnType(ArrowTypeHelper.arrowTypeToProtobuf(retType, null));
+ ifNodeBuilder.setReturnType(ArrowTypeHelper.arrowTypeToProtobuf(retType));
 
  GandivaTypes.TreeNode.Builder builder = GandivaTypes.TreeNode.newBuilder();
  builder.setIfNode(ifNodeBuilder.build());

diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java
@@ -32,7 +32,7 @@ class NullNode implements TreeNode {
  @Override
  public GandivaTypes.TreeNode toProtobuf() throws GandivaException {
  GandivaTypes.NullNode.Builder nullNode = GandivaTypes.NullNode.newBuilder();
- nullNode.setType(ArrowTypeHelper.arrowTypeToProtobuf(type, null));
+ nullNode.setType(ArrowTypeHelper.arrowTypeToProtobuf(type));
 
  GandivaTypes.TreeNode.Builder builder = GandivaTypes.TreeNode.newBuilder();
  builder.setNullNode(nullNode.build());

diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java
@@ -94,12 +94,6 @@ public static TreeNode makeField(Field field) {
  public static TreeNode makeFunction(String function,
  List<TreeNode> children,
  ArrowType retType) {
- StackTraceElement[] elements = Thread.currentThread().getStackTrace();
- for (int i = 1; i < elements.length; i++) {
- StackTraceElement s = elements[i];
- System.out.println("\tat " + s.getClassName() + "." + s.getMethodName() +
- "(" + s.getFileName() + ":" + s.getLineNumber() + ")");
- }
  return new FunctionNode(function, children, retType);
  }
 

diff --git a/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java b/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
@@ -161,7 +161,7 @@ public InnerAllocator() {
  }
 
  private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCapacity) {
- PoolArenasCache cache = threadCache();
+ PoolThreadCache cache = threadCache();
  PoolArena<ByteBuffer> directArena = cache.directArena;
 
  if (directArena != null) {