Skip to content
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

Jump to bottom

ARROW-11299: [Python] Fix invalid-offsetof warnings #9274

Closed
wants to merge 2 commits into from
Closed

ARROW-11299: [Python] Fix invalid-offsetof warnings #9274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807eee2
ARROW-11299: [Python] Fix invalid-offsetof warnings
cyb70289 Jan 19, 2021
dff4bf7
restore castoptions property setter
cyb70289 Jan 22, 2021
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
117 changes: 61 additions & 56 deletions python/pyarrow/_compute.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,16 +481,17 @@ cdef class FunctionOptions(_Weakrefable):

cdef class _CastOptions(FunctionOptions):
cdef:
CCastOptions options
unique_ptr[CCastOptions] options

__slots__ = () # avoid mistakingly creating attributes

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.options
return self.options.get()

def _set_options(self, DataType target_type, allow_int_overflow,
allow_time_truncate, allow_time_overflow,
allow_float_truncate, allow_invalid_utf8):
self.options.reset(new CCastOptions())
self._set_type(target_type)
if allow_int_overflow is not None:
self.allow_int_overflow = allow_int_overflow
Expand All @@ -505,64 +506,64 @@ cdef class _CastOptions(FunctionOptions):

def _set_type(self, target_type=None):
if target_type is not None:
self.options.to_type = (
deref(self.options).to_type = (
(<DataType> ensure_type(target_type)).sp_type
)

def _set_safe(self):
self.options = CCastOptions.Safe()
self.options.reset(new CCastOptions(CCastOptions.Safe()))
cyb70289 marked this conversation as resolved.
Show resolved Hide resolved

def _set_unsafe(self):
self.options = CCastOptions.Unsafe()
self.options.reset(new CCastOptions(CCastOptions.Unsafe()))

def is_safe(self):
return not (
self.options.allow_int_overflow or
self.options.allow_time_truncate or
self.options.allow_time_overflow or
self.options.allow_float_truncate or
self.options.allow_invalid_utf8
deref(self.options).allow_int_overflow or
deref(self.options).allow_time_truncate or
deref(self.options).allow_time_overflow or
deref(self.options).allow_float_truncate or
deref(self.options).allow_invalid_utf8
)

@property
def allow_int_overflow(self):
return self.options.allow_int_overflow
return deref(self.options).allow_int_overflow

@allow_int_overflow.setter
def allow_int_overflow(self, bint flag):
self.options.allow_int_overflow = flag
deref(self.options).allow_int_overflow = flag

@property
def allow_time_truncate(self):
return self.options.allow_time_truncate
return deref(self.options).allow_time_truncate

@allow_time_truncate.setter
def allow_time_truncate(self, bint flag):
self.options.allow_time_truncate = flag
deref(self.options).allow_time_truncate = flag

@property
def allow_time_overflow(self):
return self.options.allow_time_overflow
return deref(self.options).allow_time_overflow

@allow_time_overflow.setter
def allow_time_overflow(self, bint flag):
self.options.allow_time_overflow = flag
deref(self.options).allow_time_overflow = flag

@property
def allow_float_truncate(self):
return self.options.allow_float_truncate
return deref(self.options).allow_float_truncate

@allow_float_truncate.setter
def allow_float_truncate(self, bint flag):
self.options.allow_float_truncate = flag
deref(self.options).allow_float_truncate = flag

@property
def allow_invalid_utf8(self):
return self.options.allow_invalid_utf8
return deref(self.options).allow_invalid_utf8

@allow_invalid_utf8.setter
def allow_invalid_utf8(self, bint flag):
self.options.allow_invalid_utf8 = flag
deref(self.options).allow_invalid_utf8 = flag


class CastOptions(_CastOptions):
Expand Down Expand Up @@ -625,20 +626,18 @@ class TrimOptions(_TrimOptions):

cdef class _FilterOptions(FunctionOptions):
cdef:
CFilterOptions filter_options
unique_ptr[CFilterOptions] filter_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.filter_options
return self.filter_options.get()

def _set_options(self, null_selection_behavior):
if null_selection_behavior == 'drop':
self.filter_options.null_selection_behavior = (
CFilterNullSelectionBehavior_DROP
)
self.filter_options.reset(
new CFilterOptions(CFilterNullSelectionBehavior_DROP))
elif null_selection_behavior == 'emit_null':
self.filter_options.null_selection_behavior = (
CFilterNullSelectionBehavior_EMIT_NULL
)
self.filter_options.reset(
new CFilterOptions(CFilterNullSelectionBehavior_EMIT_NULL))
else:
raise ValueError(
'"{}" is not a valid null_selection_behavior'
Expand All @@ -652,13 +651,13 @@ class FilterOptions(_FilterOptions):

cdef class _TakeOptions(FunctionOptions):
cdef:
CTakeOptions take_options
unique_ptr[CTakeOptions] take_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.take_options
return self.take_options.get()

def _set_options(self, boundscheck):
self.take_options.boundscheck = boundscheck
self.take_options.reset(new CTakeOptions(boundscheck))


class TakeOptions(_TakeOptions):
Expand Down Expand Up @@ -704,16 +703,18 @@ class ProjectOptions(_ProjectOptions):

cdef class _MinMaxOptions(FunctionOptions):
cdef:
CMinMaxOptions min_max_options
unique_ptr[CMinMaxOptions] min_max_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.min_max_options
return self.min_max_options.get()

def _set_options(self, null_handling):
if null_handling == 'skip':
self.min_max_options.null_handling = CMinMaxMode_SKIP
self.min_max_options.reset(
new CMinMaxOptions(CMinMaxMode_SKIP))
elif null_handling == 'emit_null':
self.min_max_options.null_handling = CMinMaxMode_EMIT_NULL
self.min_max_options.reset(
new CMinMaxOptions(CMinMaxMode_EMIT_NULL))
else:
raise ValueError(
'{!r} is not a valid null_handling'
Expand All @@ -727,16 +728,18 @@ class MinMaxOptions(_MinMaxOptions):

cdef class _CountOptions(FunctionOptions):
cdef:
CCountOptions count_options
unique_ptr[CCountOptions] count_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.count_options
return self.count_options.get()

def _set_options(self, count_mode):
if count_mode == 'count_null':
self.count_options.count_mode = CCountMode_COUNT_NULL
self.count_options.reset(
new CCountOptions(CCountMode_COUNT_NULL))
elif count_mode == 'count_non_null':
self.count_options.count_mode = CCountMode_COUNT_NON_NULL
self.count_options.reset(
new CCountOptions(CCountMode_COUNT_NON_NULL))
else:
raise ValueError(
'{!r} is not a valid count_mode'
Expand All @@ -750,13 +753,13 @@ class CountOptions(_CountOptions):

cdef class _ModeOptions(FunctionOptions):
cdef:
CModeOptions mode_options
unique_ptr[CModeOptions] mode_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.mode_options
return self.mode_options.get()

def _set_options(self, n):
self.mode_options.n = n
self.mode_options.reset(new CModeOptions(n))


class ModeOptions(_ModeOptions):
Expand Down Expand Up @@ -826,13 +829,13 @@ class StrptimeOptions(_StrptimeOptions):

cdef class _VarianceOptions(FunctionOptions):
cdef:
CVarianceOptions variance_options
unique_ptr[CVarianceOptions] variance_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.variance_options
return self.variance_options.get()

def _set_options(self, ddof):
self.variance_options.ddof = ddof
self.variance_options.reset(new CVarianceOptions(ddof))


class VarianceOptions(_VarianceOptions):
Expand Down Expand Up @@ -876,16 +879,18 @@ class SplitPatternOptions(_SplitPatternOptions):

cdef class _ArraySortOptions(FunctionOptions):
cdef:
CArraySortOptions array_sort_options
unique_ptr[CArraySortOptions] array_sort_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.array_sort_options
return self.array_sort_options.get()

def _set_options(self, order):
if order == "ascending":
self.array_sort_options.order = CSortOrder_Ascending
self.array_sort_options.reset(
new CArraySortOptions(CSortOrder_Ascending))
elif order == "descending":
self.array_sort_options.order = CSortOrder_Descending
self.array_sort_options.reset(
new CArraySortOptions(CSortOrder_Descending))
else:
raise ValueError(
"{!r} is not a valid order".format(order)
Expand All @@ -899,10 +904,10 @@ class ArraySortOptions(_ArraySortOptions):

cdef class _SortOptions(FunctionOptions):
cdef:
CSortOptions sort_options
unique_ptr[CSortOptions] sort_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.sort_options
return self.sort_options.get()

def _set_options(self, sort_keys):
cdef:
Expand All @@ -922,7 +927,7 @@ cdef class _SortOptions(FunctionOptions):
c_name = tobytes(name)
c_sort_keys.push_back(CSortKey(c_name, c_order))

self.sort_options.sort_keys = c_sort_keys
self.sort_options.reset(new CSortOptions(c_sort_keys))


class SortOptions(_SortOptions):
Expand All @@ -934,10 +939,10 @@ class SortOptions(_SortOptions):

cdef class _QuantileOptions(FunctionOptions):
cdef:
CQuantileOptions quantile_options
unique_ptr[CQuantileOptions] quantile_options

cdef const CFunctionOptions* get_options(self) except NULL:
return &self.quantile_options
return self.quantile_options.get()

def _set_options(self, quantiles, interp):
interp_dict = {
Expand All @@ -951,8 +956,8 @@ cdef class _QuantileOptions(FunctionOptions):
raise ValueError(
'{!r} is not a valid interpolation'
.format(interp))
self.quantile_options.interpolation = interp_dict[interp]
self.quantile_options.q = quantiles
self.quantile_options.reset(
new CQuantileOptions(quantiles, interp_dict[interp]))


class QuantileOptions(_QuantileOptions):
Expand Down
17 changes: 13 additions & 4 deletions python/pyarrow/includes/libarrow.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:
cdef cppclass CCastOptions" arrow::compute::CastOptions"(CFunctionOptions):
CCastOptions()
CCastOptions(c_bool safe)
CCastOptions(CCastOptions&& options)

@staticmethod
CCastOptions Safe()
Expand Down Expand Up @@ -1783,6 +1784,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CTakeOptions \
" arrow::compute::TakeOptions"(CFunctionOptions):
CTakeOptions(c_bool boundscheck)
c_bool boundscheck

cdef cppclass CStrptimeOptions \
Expand All @@ -1791,6 +1793,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CVarianceOptions \
"arrow::compute::VarianceOptions"(CFunctionOptions):
CVarianceOptions(int ddof)
int ddof

enum CMinMaxMode \
Expand All @@ -1800,14 +1803,16 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:
CMinMaxMode_EMIT_NULL \
"arrow::compute::MinMaxOptions::EMIT_NULL"

cdef cppclass CModeOptions \
"arrow::compute::ModeOptions"(CFunctionOptions):
int64_t n

cdef cppclass CMinMaxOptions \
"arrow::compute::MinMaxOptions"(CFunctionOptions):
CMinMaxOptions(CMinMaxMode null_handling)
CMinMaxMode null_handling

cdef cppclass CModeOptions \
"arrow::compute::ModeOptions"(CFunctionOptions):
CModeOptions(int64_t n)
int64_t n

enum CCountMode \
"arrow::compute::CountOptions::Mode":
CCountMode_COUNT_NON_NULL \
Expand All @@ -1817,6 +1822,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CCountOptions \
"arrow::compute::CountOptions"(CFunctionOptions):
CCountOptions(CCountMode count_mode)
CCountMode count_mode

cdef cppclass CPartitionNthOptions \
Expand All @@ -1837,6 +1843,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CArraySortOptions \
"arrow::compute::ArraySortOptions"(CFunctionOptions):
CArraySortOptions(CSortOrder order)
CSortOrder order

cdef cppclass CSortKey" arrow::compute::SortKey":
Expand All @@ -1846,6 +1853,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CSortOptions \
"arrow::compute::SortOptions"(CFunctionOptions):
CSortOptions(vector[CSortKey] sort_keys)
vector[CSortKey] sort_keys

enum CQuantileInterp \
Expand All @@ -1858,6 +1866,7 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:

cdef cppclass CQuantileOptions \
"arrow::compute::QuantileOptions"(CFunctionOptions):
CQuantileOptions(vector[double] q, CQuantileInterp interpolation)
vector[double] q
CQuantileInterp interpolation

Expand Down