Skip to content

Commit 7223fdd

Browse files
committed
chore: fmt
1 parent 3f6a953 commit 7223fdd

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

pyiceberg/table/update/sorting.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# under the License.
1717
from __future__ import annotations
1818

19-
from typing import TYPE_CHECKING, Any, List, Tuple, Optional
19+
from typing import TYPE_CHECKING, Any, List, Optional, Tuple
2020

21-
from pyiceberg.table.sorting import NullOrder, SortDirection, SortField, SortOrder, INITIAL_SORT_ORDER_ID, UNSORTED_SORT_ORDER
21+
from pyiceberg.table.sorting import INITIAL_SORT_ORDER_ID, UNSORTED_SORT_ORDER, NullOrder, SortDirection, SortField, SortOrder
2222
from pyiceberg.table.update import (
2323
AddSortOrderUpdate,
2424
AssertDefaultSortOrderId,
@@ -74,7 +74,7 @@ def _add_sort_field(
7474
)
7575
)
7676
return self
77-
77+
7878
def _reuse_or_create_sort_order_id(self) -> int:
7979
"""Return the last assigned sort order id or create a new one."""
8080
new_sort_order_id = INITIAL_SORT_ORDER_ID
@@ -123,7 +123,10 @@ def _commit(self) -> UpdatesAndRequirements:
123123
requirements: Tuple[TableRequirement, ...] = ()
124124
updates: Tuple[TableUpdate, ...] = ()
125125

126-
if self._transaction.table_metadata.default_sort_order_id != new_sort_order.order_id and self._transaction.table_metadata.sort_order_by_id(new_sort_order.order_id) is None:
126+
if (
127+
self._transaction.table_metadata.default_sort_order_id != new_sort_order.order_id
128+
and self._transaction.table_metadata.sort_order_by_id(new_sort_order.order_id) is None
129+
):
127130
updates = (AddSortOrderUpdate(sort_order=new_sort_order), SetDefaultSortOrderUpdate(sort_order_id=-1))
128131
else:
129132
updates = (SetDefaultSortOrderUpdate(sort_order_id=new_sort_order.order_id),)

tests/integration/test_sort_order_update.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ def test_update_existing_sort_order(catalog: Catalog, format_version: str, table
130130
"bar", IdentityTransform(), NullOrder.NULLS_FIRST
131131
).commit()
132132
# Go back to the first sort order
133-
simple_table.update_sort_order().asc("foo", IdentityTransform(), NullOrder.NULLS_FIRST).commit()
133+
simple_table.update_sort_order().asc("foo", IdentityTransform(), NullOrder.NULLS_FIRST).commit()
134134
assert (
135135
len(simple_table.sort_orders()) == 3
136-
) # line 133 should not create a new sort order since it is the same as the first one
136+
) # line 133 should not create a new sort order since it is the same as the first one
137137
assert simple_table.sort_order() == SortOrder(
138138
SortField(source_id=1, transform=IdentityTransform(), direction=SortDirection.ASC, null_order=NullOrder.NULLS_FIRST),
139139
order_id=1,

0 commit comments

Comments
 (0)