From 291ee196b004bc673146ff61e2f7eb1fd07ff40e Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Fri, 3 Feb 2023 08:44:35 -0800 Subject: [PATCH] GH-34033: [Python] Remove deprecated `use_async` Has been deprecated since Arrow 7.0.0, time to make things nice and clean --- python/pyarrow/_dataset.pyx | 44 ++-------------------------- python/pyarrow/tests/test_dataset.py | 26 ---------------- 2 files changed, 3 insertions(+), 67 deletions(-) diff --git a/python/pyarrow/_dataset.pyx b/python/pyarrow/_dataset.pyx index 38ff60f380d0..25e793572172 100644 --- a/python/pyarrow/_dataset.pyx +++ b/python/pyarrow/_dataset.pyx @@ -2437,9 +2437,6 @@ cdef class Scanner(_Weakrefable): use_threads : bool, default True If enabled, then maximum parallelism will be used determined by the number of available CPU cores. - use_async : bool, default True - This flag is deprecated and is being kept for this release for - backwards compatibility. It will be removed in the next release. memory_pool : MemoryPool, default None For memory allocations, if required. If not specified, uses the default pool. @@ -2493,8 +2490,7 @@ cdef class Scanner(_Weakrefable): int batch_readahead=_DEFAULT_BATCH_READAHEAD, int fragment_readahead=_DEFAULT_FRAGMENT_READAHEAD, FragmentScanOptions fragment_scan_options=None, - bint use_threads=True, object use_async=None, - MemoryPool memory_pool=None): + bint use_threads=True, MemoryPool memory_pool=None): """ Create Scanner from Dataset, @@ -2544,10 +2540,6 @@ cdef class Scanner(_Weakrefable): use_threads : bool, default True If enabled, then maximum parallelism will be used determined by the number of available CPU cores. - use_async : bool, default True - This flag is deprecated and is being kept for this release for - backwards compatibility. It will be removed in the next - release. memory_pool : MemoryPool, default None For memory allocations, if required. If not specified, uses the default pool. @@ -2557,11 +2549,6 @@ cdef class Scanner(_Weakrefable): shared_ptr[CScannerBuilder] builder shared_ptr[CScanner] scanner - if use_async is not None: - warnings.warn('The use_async flag is deprecated and has no ' - 'effect. It will be removed in the next release.', - FutureWarning) - options = Scanner._make_scan_options( dataset, dict(columns=columns, filter=filter, batch_size=batch_size, @@ -2579,8 +2566,7 @@ cdef class Scanner(_Weakrefable): int batch_size=_DEFAULT_BATCH_SIZE, int batch_readahead=_DEFAULT_BATCH_READAHEAD, FragmentScanOptions fragment_scan_options=None, - bint use_threads=True, object use_async=None, - MemoryPool memory_pool=None,): + bint use_threads=True, MemoryPool memory_pool=None,): """ Create Scanner from Fragment, @@ -2629,20 +2615,12 @@ cdef class Scanner(_Weakrefable): use_threads : bool, default True If enabled, then maximum parallelism will be used determined by the number of available CPU cores. - use_async : bool, default True - This flag is deprecated and is being kept for this release for - backwards compatibility. It will be removed in the next - release. memory_pool : MemoryPool, default None For memory allocations, if required. If not specified, uses the default pool. use_threads : bool, default True If enabled, then maximum parallelism will be used determined by the number of available CPU cores. - use_async : bool, default True - This flag is deprecated and is being kept for this release for - backwards compatibility. It will be removed in the next - release. memory_pool : MemoryPool, default None For memory allocations, if required. If not specified, uses the default pool. @@ -2654,11 +2632,6 @@ cdef class Scanner(_Weakrefable): schema = schema or fragment.physical_schema - if use_async is not None: - warnings.warn('The use_async flag is deprecated and has no ' - 'effect. It will be removed in the next release.', - FutureWarning) - builder = make_shared[CScannerBuilder](pyarrow_unwrap_schema(schema), fragment.unwrap(), options) _populate_builder(builder, columns=columns, filter=filter, @@ -2675,8 +2648,7 @@ cdef class Scanner(_Weakrefable): def from_batches(source, *, Schema schema=None, object columns=None, Expression filter=None, int batch_size=_DEFAULT_BATCH_SIZE, FragmentScanOptions fragment_scan_options=None, - bint use_threads=True, object use_async=None, - MemoryPool memory_pool=None): + bint use_threads=True, MemoryPool memory_pool=None): """ Create a Scanner from an iterator of batches. @@ -2702,10 +2674,6 @@ cdef class Scanner(_Weakrefable): use_threads : bool, default True If enabled, then maximum parallelism will be used determined by the number of available CPU cores. - use_async : bool, default True - This flag is deprecated and is being kept for this release for - backwards compatibility. It will be removed in the next - release. memory_pool : MemoryPool, default None For memory allocations, if required. If not specified, uses the default pool. @@ -2730,12 +2698,6 @@ cdef class Scanner(_Weakrefable): 'batches instead of the given type: ' + type(source).__name__) builder = CScannerBuilder.FromRecordBatchReader(reader.reader) - - if use_async is not None: - warnings.warn('The use_async flag is deprecated and has no ' - 'effect. It will be removed in the next release.', - FutureWarning) - _populate_builder(builder, columns=columns, filter=filter, batch_size=batch_size, batch_readahead=_DEFAULT_BATCH_READAHEAD, fragment_readahead=_DEFAULT_FRAGMENT_READAHEAD, use_threads=use_threads, diff --git a/python/pyarrow/tests/test_dataset.py b/python/pyarrow/tests/test_dataset.py index f6b4c1e9b7cf..ebacd0235916 100644 --- a/python/pyarrow/tests/test_dataset.py +++ b/python/pyarrow/tests/test_dataset.py @@ -512,32 +512,6 @@ def test_scanner_memory_pool(dataset): pa.set_memory_pool(old_pool) -@pytest.mark.parquet -def test_scanner_async_deprecated(dataset): - with pytest.warns(FutureWarning): - dataset.scanner(use_async=False) - with pytest.warns(FutureWarning): - dataset.scanner(use_async=True) - with pytest.warns(FutureWarning): - dataset.to_table(use_async=False) - with pytest.warns(FutureWarning): - dataset.to_table(use_async=True) - with pytest.warns(FutureWarning): - dataset.head(1, use_async=False) - with pytest.warns(FutureWarning): - dataset.head(1, use_async=True) - with pytest.warns(FutureWarning): - ds.Scanner.from_dataset(dataset, use_async=False) - with pytest.warns(FutureWarning): - ds.Scanner.from_dataset(dataset, use_async=True) - with pytest.warns(FutureWarning): - ds.Scanner.from_fragment( - next(dataset.get_fragments()), use_async=False) - with pytest.warns(FutureWarning): - ds.Scanner.from_fragment( - next(dataset.get_fragments()), use_async=True) - - @pytest.mark.parquet def test_head(dataset, dataset_reader): result = dataset_reader.head(dataset, 0)