use gandiva files

Author: pcmoritz

python/pyarrow/gandiva.pyx

@@ -27,10 +27,9 @@ from libc.stdint cimport int64_t, uint8_t, uintptr_t
 
 from pyarrow.includes.libarrow cimport *
 from pyarrow.compat import frombytes
-from pyarrow.lib cimport pyarrow_wrap_array
+from pyarrow.lib cimport (check_status, pyarrow_wrap_array)
 
-from pyarrow.includes.libgandiva cimport (GStatus, CExpression,
-                                          CCondition,
+from pyarrow.includes.libgandiva cimport (CCondition, CExpression,
                                           CNode, CProjector, CFilter,
                                           CSelectionVector,
                                           TreeExprBuilder_MakeExpression,
@@ -46,14 +45,6 @@ from pyarrow.includes.libgandiva cimport (GStatus, CExpression,
 from pyarrow.lib cimport (Array, DataType, Field, MemoryPool,
                           RecordBatch, Schema)
 
-cdef int check_status(const GStatus& status) nogil except -1:
-    if status.ok():
-        return 0
-
-    with gil:
-        message = frombytes(status.message())
-        raise Exception(message)
-
 cdef class Node:
     cdef:
         shared_ptr[CNode] node

python/pyarrow/includes/libgandiva.pxd

@@ -20,19 +20,6 @@
 from pyarrow.includes.common cimport *
 from pyarrow.includes.libarrow cimport *
 
-cdef extern from "arrow/status.h" namespace "gandiva" nogil:
-    # We can later add more of the common status factory methods as needed
-    cdef GStatus GStatus_OK "Status::OK"()
-    cdef GStatus GStatus_Invalid "Status::Invalid"()
-
-    cdef cppclass GStatus "arrow::Status":
-        GStatus()
-
-        c_string ToString()
-        c_string message()
-
-        c_bool ok()
-
 cdef extern from "gandiva/gandiva_aliases.h" namespace "gandiva" nogil:
 
     cdef cppclass CNode" gandiva::Node":
@@ -52,7 +39,7 @@ cdef extern from "gandiva/selection_vector.h" namespace "gandiva" nogil:
 
         shared_ptr[CArray] ToArray()
 
-    cdef GStatus SelectionVector_MakeInt32\
+    cdef CStatus SelectionVector_MakeInt32\
         "gandiva::SelectionVector::MakeInt32"(
             int max_slots, CMemoryPool* pool,
             shared_ptr[CSelectionVector]* selection_vector)
@@ -93,7 +80,7 @@ cdef extern from "gandiva/tree_expr_builder.h" namespace "gandiva" nogil:
         "gandiva::TreeExprBuilder::MakeCondition"(
             shared_ptr[CNode] condition)
 
-    cdef GStatus Projector_Make \
+    cdef CStatus Projector_Make \
         "gandiva::Projector::Make"(
             shared_ptr[CSchema] schema, const CExpressionVector& children,
             shared_ptr[CProjector]* projector)
@@ -102,19 +89,19 @@ cdef extern from "gandiva/projector.h" namespace "gandiva" nogil:
 
     cdef cppclass CProjector" gandiva::Projector":
 
-        GStatus Evaluate(
+        CStatus Evaluate(
             const CRecordBatch& batch, CMemoryPool* pool,
             const CArrayVector* output)
 
 cdef extern from "gandiva/filter.h" namespace "gandiva" nogil:
 
     cdef cppclass CFilter" gandiva::Filter":
 
-        GStatus Evaluate(
+        CStatus Evaluate(
             const CRecordBatch& batch,
             shared_ptr[CSelectionVector] out_selection)
 
-    cdef GStatus Filter_Make \
+    cdef CStatus Filter_Make \
         "gandiva::Filter::Make"(
             shared_ptr[CSchema] schema, shared_ptr[CCondition] condition,
             shared_ptr[CFilter]* filter)