Skip to content

GH-45129: [Python][C++] Fix usage of deprecated C++ functionality on pyarrow #45189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulcd merged 4 commits into from
Jan 21, 2025
Merged

GH-45129: [Python][C++] Fix usage of deprecated C++ functionality on pyarrow #45189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
736829d
GH-45129: [Python][C++] Fix usage of deprecated C++ functionality on …
raulcd Jan 7, 2025
a38d756
We seem to require a shared_ptr insted of unique_ptr due to our imple…
raulcd Jan 7, 2025
4b2e3d4
This sould be SharedPtrNoGIL as we are usng no_gil
raulcd Jan 7, 2025
0a1d214
Revert to unique_ptr as returned from C++
raulcd Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions python/pyarrow/_parquet.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,9 @@ cdef extern from "parquet/arrow/reader.h" namespace "parquet::arrow" nogil:
const vector[int]& column_indices,
shared_ptr[CTable]* out)

CStatus GetRecordBatchReader(const vector[int]& row_group_indices,
const vector[int]& column_indices,
unique_ptr[CRecordBatchReader]* out)
CStatus GetRecordBatchReader(const vector[int]& row_group_indices,
unique_ptr[CRecordBatchReader]* out)
CResult[unique_ptr[CRecordBatchReader]] GetRecordBatchReader(const vector[int]& row_group_indices,
const vector[int]& column_indices)
CResult[unique_ptr[CRecordBatchReader]] GetRecordBatchReader(const vector[int]& row_group_indices)

CStatus ReadTable(shared_ptr[CTable]* out)
CStatus ReadTable(const vector[int]& column_indices,
Expand Down
8 changes: 4 additions & 4 deletions python/pyarrow/_parquet.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,16 +1616,16 @@ cdef class ParquetReader(_Weakrefable):
for index in column_indices:
c_column_indices.push_back(index)
with nogil:
check_status(
recordbatchreader = GetResultValue(
self.reader.get().GetRecordBatchReader(
c_row_groups, c_column_indices, &recordbatchreader
c_row_groups, c_column_indices
)
)
else:
with nogil:
check_status(
recordbatchreader = GetResultValue(
self.reader.get().GetRecordBatchReader(
c_row_groups, &recordbatchreader
c_row_groups
)
)

Expand Down
4 changes: 2 additions & 2 deletions python/pyarrow/src/arrow/python/python_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ Status TestDecimal128OverflowFails() {
ASSERT_EQ(38, metadata.precision());
ASSERT_EQ(1, metadata.scale());

auto type = ::arrow::decimal(38, 38);
auto type = ::arrow::smallest_decimal(38, 38);
const auto& decimal_type = checked_cast<const DecimalType&>(*type);
ASSERT_RAISES(Invalid,
internal::DecimalFromPythonDecimal(python_decimal, decimal_type, &value));
Expand All @@ -689,7 +689,7 @@ Status TestDecimal256OverflowFails() {
ASSERT_EQ(76, metadata.precision());
ASSERT_EQ(1, metadata.scale());

auto type = ::arrow::decimal(76, 76);
auto type = ::arrow::smallest_decimal(76, 76);
const auto& decimal_type = checked_cast<const DecimalType&>(*type);
ASSERT_RAISES(Invalid,
internal::DecimalFromPythonDecimal(python_decimal, decimal_type, &value));
Expand Down
Loading