Also check condition in make_filter for None

apache · Dec 9, 2021 · 88e65b4 · 88e65b4
1 parent 14752e4
commit 88e65b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/python/pyarrow/gandiva.pyx b/python/pyarrow/gandiva.pyx
@@ -465,6 +465,8 @@ cpdef make_projector(Schema schema, children, MemoryPool pool,
 
 cpdef make_filter(Schema schema, Condition condition):
     cdef shared_ptr[CFilter] result
+    if condition is None:
+        raise TypeError("Condition must not be None")
     check_status(
         Filter_Make(schema.sp_schema, condition.condition, &result))
     return Filter.create(result)

diff --git a/python/pyarrow/tests/test_gandiva.py b/python/pyarrow/tests/test_gandiva.py
@@ -428,5 +428,5 @@ def test_rejects_none():
     with pytest.raises(TypeError):
         gandiva.make_projector(schema, [None])
 
-    with pytest.raises(pa.lib.ArrowInvalid):
+    with pytest.raises(TypeError):
         gandiva.make_filter(schema, None)