Skip to content

Commit

Permalink
Rename methods
Browse files Browse the repository at this point in the history
  • Loading branch information
judahrand committed Dec 19, 2023
1 parent 842107f commit 44dff9d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions python/pyarrow/_parquet.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ cdef class SortingColumn:
depth-first order. This may make the column indices for nested schemas
different from what you expect. In most cases, it will be easier to
specify the sort order using column names instead of column indices
and converting using the ``from_sort_order`` method.
and converting using the ``from_ordering`` method.
Examples
--------
Expand All @@ -546,18 +546,18 @@ cdef class SortingColumn:
>>> [pq.SortingColumn(0), pq.SortingColumn(1, descending=True)]
[SortingColumn(column_index=0, descending=False, nulls_first=False), SortingColumn(column_index=1, descending=True, nulls_first=False)]
Convert the sort_order into the list of sorting columns with
``from_sort_order`` (note that the schema must be provided as well):
Convert the sort_order into the list of sorting columns with
``from_ordering`` (note that the schema must be provided as well):
>>> import pyarrow as pa
>>> schema = pa.schema([('id', pa.int64()), ('timestamp', pa.timestamp('ms'))])
>>> sorting_columns = pq.SortingColumn.from_sort_order(schema, sort_order)
>>> sorting_columns = pq.SortingColumn.from_ordering(schema, sort_order)
>>> sorting_columns
(SortingColumn(column_index=0, descending=False, nulls_first=False), SortingColumn(column_index=1, descending=True, nulls_first=False))
Convert back to the sort order with ``to_sort_order``:
Convert back to the sort order with ``to_ordering``:
>>> pq.SortingColumn.to_sort_order(schema, sorting_columns)
>>> pq.SortingColumn.to_ordering(schema, sorting_columns)
((('id', 'ascending'), ('timestamp', 'descending')), 'at_end')
See Also
Expand All @@ -574,7 +574,7 @@ cdef class SortingColumn:
self.nulls_first = nulls_first

@classmethod
def from_sort_order(cls, Schema schema, sort_keys, null_placement='at_end'):
def from_ordering(cls, Schema schema, sort_keys, null_placement='at_end'):
"""
Create a tuple of SortingColumn objects from the same arguments as
:class:`pyarrow.compute.SortOptions`.
Expand Down Expand Up @@ -636,7 +636,7 @@ cdef class SortingColumn:
return tuple(sorting_columns)

@staticmethod
def to_sort_order(Schema schema, sorting_columns):
def to_ordering(Schema schema, sorting_columns):
"""
Convert a tuple of SortingColumn objects to the same format as
:class:`pyarrow.compute.SortOptions`.
Expand Down
16 changes: 8 additions & 8 deletions python/pyarrow/tests/parquet/test_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,15 @@ def test_parquet_sorting_column():
pq.SortingColumn(1, descending=True),
pq.SortingColumn(0, descending=False),
)
sort_order, null_placement = pq.SortingColumn.to_sort_order(schema, sorting_cols)
sort_order, null_placement = pq.SortingColumn.to_ordering(schema, sorting_cols)
assert sort_order == (('b', "descending"), ('a', "ascending"))
assert null_placement == "at_end"

sorting_cols_roundtripped = pq.SortingColumn.from_sort_order(
sorting_cols_roundtripped = pq.SortingColumn.from_ordering(
schema, sort_order, null_placement)
assert sorting_cols_roundtripped == sorting_cols

sorting_cols = pq.SortingColumn.from_sort_order(
sorting_cols = pq.SortingColumn.from_ordering(
schema, ('a', ('b', "descending")), null_placement="at_start")
expected = (
pq.SortingColumn(0, descending=False, nulls_first=True),
Expand All @@ -334,20 +334,20 @@ def test_parquet_sorting_column():
assert sorting_cols == expected

# Conversions handle empty tuples
empty_sorting_cols = pq.SortingColumn.from_sort_order(schema, ())
empty_sorting_cols = pq.SortingColumn.from_ordering(schema, ())
assert empty_sorting_cols == ()

assert pq.SortingColumn.to_sort_order(schema, ()) == ((), "at_end")
assert pq.SortingColumn.to_ordering(schema, ()) == ((), "at_end")

with pytest.raises(ValueError):
pq.SortingColumn.from_sort_order(schema, (("a", "not a valid sort order")))
pq.SortingColumn.from_ordering(schema, (("a", "not a valid sort order")))

with pytest.raises(ValueError, match="inconsistent null placement"):
sorting_cols = (
pq.SortingColumn(1, nulls_first=True),
pq.SortingColumn(0, nulls_first=False),
)
pq.SortingColumn.to_sort_order(schema, sorting_cols)
pq.SortingColumn.to_ordering(schema, sorting_cols)


def test_parquet_sorting_column_nested():
Expand All @@ -361,7 +361,7 @@ def test_parquet_sorting_column_nested():
pq.SortingColumn(2, descending=False) # b
]

sort_order, null_placement = pq.SortingColumn.to_sort_order(schema, sorting_columns)
sort_order, null_placement = pq.SortingColumn.to_ordering(schema, sorting_columns)
assert null_placement == "at_end"
assert len(sort_order) == 2
assert sort_order[0] == ("a.x", "descending")
Expand Down

0 comments on commit 44dff9d

Please sign in to comment.