diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index a2cf8901bac4..2f8a60c9de44 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -524,7 +524,7 @@ set(CYTHON_EXTENSIONS lib _compute _csv - _exec_plan + _acero _feather _fs _hdfsio @@ -784,7 +784,7 @@ endif() if(PYARROW_BUILD_DATASET) target_link_libraries(_dataset PRIVATE ${DATASET_LINK_LIBS}) - target_link_libraries(_exec_plan PRIVATE ${DATASET_LINK_LIBS}) + target_link_libraries(_acero PRIVATE ${DATASET_LINK_LIBS}) if(PYARROW_BUILD_ORC) target_link_libraries(_dataset_orc PRIVATE ${DATASET_LINK_LIBS}) endif() diff --git a/python/pyarrow/_exec_plan.pyx b/python/pyarrow/_acero.pyx similarity index 100% rename from python/pyarrow/_exec_plan.pyx rename to python/pyarrow/_acero.pyx diff --git a/python/pyarrow/_dataset.pyx b/python/pyarrow/_dataset.pyx index 8bb1a0a1cb78..2b408d999f9a 100644 --- a/python/pyarrow/_dataset.pyx +++ b/python/pyarrow/_dataset.pyx @@ -803,10 +803,10 @@ cdef class Dataset(_Weakrefable): if isinstance(sorting, str): sorting = [(sorting, "ascending")] - res = _pc()._exec_plan._sort_source(self, output_type=InMemoryDataset, - sort_options=_pc().SortOptions( - sort_keys=sorting, **kwargs - )) + res = _pc()._acero._sort_source( + self, output_type=InMemoryDataset, + sort_options=_pc().SortOptions(sort_keys=sorting, **kwargs) + ) return res def join(self, right_dataset, keys, right_keys=None, join_type="left outer", @@ -852,10 +852,12 @@ cdef class Dataset(_Weakrefable): """ if right_keys is None: right_keys = keys - return _pc()._exec_plan._perform_join(join_type, self, keys, right_dataset, right_keys, - left_suffix=left_suffix, right_suffix=right_suffix, - use_threads=use_threads, coalesce_keys=coalesce_keys, - output_type=InMemoryDataset) + return _pc()._acero._perform_join( + join_type, self, keys, right_dataset, right_keys, + left_suffix=left_suffix, right_suffix=right_suffix, + use_threads=use_threads, coalesce_keys=coalesce_keys, + output_type=InMemoryDataset + ) cdef class InMemoryDataset(Dataset): diff --git a/python/pyarrow/lib.pyx b/python/pyarrow/lib.pyx index a665ea59c6e5..803e2b7823d2 100644 --- a/python/pyarrow/lib.pyx +++ b/python/pyarrow/lib.pyx @@ -127,8 +127,8 @@ def _pc(): if __pc is None: import pyarrow.compute as pc try: - from pyarrow import _exec_plan - pc._exec_plan = _exec_plan + from pyarrow import _acero + pc._acero = _acero except ImportError: pass __pc = pc diff --git a/python/pyarrow/table.pxi b/python/pyarrow/table.pxi index e400605e5662..01476ca5aeef 100644 --- a/python/pyarrow/table.pxi +++ b/python/pyarrow/table.pxi @@ -3121,8 +3121,7 @@ cdef class Table(_PandasConvertible): animals: [["Flamingo","Horse",null]] """ if isinstance(mask, _pc().Expression): - return _pc()._exec_plan._filter_table(self, mask, - output_type=Table) + return _pc()._acero._filter_table(self, mask, output_type=Table) else: return _pc().filter(self, mask, null_selection_behavior) @@ -5021,10 +5020,11 @@ cdef class Table(_PandasConvertible): """ if right_keys is None: right_keys = keys - return _pc()._exec_plan._perform_join(join_type, self, keys, right_table, right_keys, - left_suffix=left_suffix, right_suffix=right_suffix, - use_threads=use_threads, coalesce_keys=coalesce_keys, - output_type=Table) + return _pc()._acero._perform_join( + join_type, self, keys, right_table, right_keys, + left_suffix=left_suffix, right_suffix=right_suffix, + use_threads=use_threads, coalesce_keys=coalesce_keys, output_type=Table + ) def _reconstruct_table(arrays, schema): diff --git a/python/pyarrow/tests/test_exec_plan.py b/python/pyarrow/tests/test_acero.py similarity index 99% rename from python/pyarrow/tests/test_exec_plan.py rename to python/pyarrow/tests/test_acero.py index 7875dff55755..ca0531f762a3 100644 --- a/python/pyarrow/tests/test_exec_plan.py +++ b/python/pyarrow/tests/test_acero.py @@ -22,7 +22,7 @@ try: import pyarrow.dataset as ds - import pyarrow._exec_plan as ep + import pyarrow._acero as ep except ImportError: pass diff --git a/python/setup.py b/python/setup.py index 4ee397ed4b3e..8f982080f55a 100755 --- a/python/setup.py +++ b/python/setup.py @@ -212,7 +212,7 @@ def initialize_options(self): '_dataset', '_dataset_orc', '_dataset_parquet', - '_exec_plan', + '_acero', '_feather', '_parquet', '_parquet_encryption',