Address comments

Author: fsaintjacques

cpp/src/gandiva/arrow.h

@@ -25,7 +25,6 @@
 #include <arrow/builder.h>
 #include <arrow/pretty_print.h>
 #include <arrow/record_batch.h>
-#include <arrow/result.h>
 #include <arrow/status.h>
 #include <arrow/type.h>
 

cpp/src/gandiva/engine.h

@@ -25,7 +25,6 @@
 
 #include "arrow/util/macros.h"
 
-#include "gandiva/arrow.h"
 #include "gandiva/configuration.h"
 #include "gandiva/llvm_includes.h"
 #include "gandiva/llvm_types.h"

cpp/src/gandiva/engine_llvm_test.cc

@@ -24,7 +24,7 @@
 
 namespace gandiva {
 
-typedef int64_t (*add_vector_func_t)(int64_t*, int);
+typedef int64_t (*add_vector_func_t)(int64_t* data, int n);
 
 class TestEngine : public ::testing::Test {
  protected:

python/pyarrow/gandiva.pyx

@@ -150,7 +150,7 @@ cdef class Projector:
         return self
 
     @property
-    def ir(self):
+    def llvm_ir(self):
         return self.projector.get().DumpIR().decode()
 
     def evaluate(self, RecordBatch batch):
@@ -179,7 +179,7 @@ cdef class Filter:
         return self
 
     @property
-    def ir(self):
+    def llvm_ir(self):
         return self.filter.get().DumpIR().decode()
 
     def evaluate(self, RecordBatch batch, MemoryPool pool, dtype='int32'):

python/pyarrow/tests/test_gandiva.py

@@ -46,7 +46,8 @@ def test_tree_exp_builder():
     projector = gandiva.make_projector(
         schema, [expr], pa.default_memory_pool())
 
-    assert projector.ir.find("@expr_") != -1
+    # Gandiva generates compute kernel function named `@expr_X`
+    assert projector.llvm_ir.find("@expr_") != -1
 
     a = pa.array([10, 12, -20, 5], type=pa.int32())
     b = pa.array([5, 15, 15, 17], type=pa.int32())
@@ -98,7 +99,9 @@ def test_filter():
     condition = builder.make_condition(cond)
 
     filter = gandiva.make_filter(table.schema, condition)
-    assert filter.ir.find("@expr_") != -1
+    # Gandiva generates compute kernel function named `@expr_X`
+    assert filter.llvm_ir.find("@expr_") != -1
+
     result = filter.evaluate(table.to_batches()[0], pa.default_memory_pool())
     assert result.to_array().equals(pa.array(range(1000), type=pa.uint32()))