Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

perf: Join op discards child ordering in unordered mode #923

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
merged 8 commits into from
Sep 23, 2024
Merged

perf: Join op discards child ordering in unordered mode #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac805ce
perf: Concat and Join ops don't compute child ordering in partial ord…
TrevorBergeron Aug 23, 2024
5f95bea
Merge remote-tracking branch 'github/main' into less_order
TrevorBergeron Sep 4, 2024
b9029f0
revert concat order loosening
TrevorBergeron Sep 4, 2024
a789065
add comment explaining join order in compile
TrevorBergeron Sep 4, 2024
0b1ce61
Merge remote-tracking branch 'github/main' into less_order
TrevorBergeron Sep 13, 2024
a5dfb24
Merge branch 'main' into less_order
TrevorBergeron Sep 13, 2024
842ddd3
Merge branch 'main' into less_order
TrevorBergeron Sep 20, 2024
4a18788
Merge branch 'main' into less_order
TrevorBergeron Sep 23, 2024
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
4 changes: 4 additions & 0 deletions 4 bigframes/core/compile/compiled.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,10 @@ def explode(self, offsets: typing.Sequence[int]) -> UnorderedIR:
columns=columns,
)

def as_ordered_ir(self) -> OrderedIR:
"""Convert to OrderedIr, but without any definite ordering."""
return OrderedIR(self._table, self._columns, predicates=self._predicates)

## Helpers
def _set_or_replace_by_id(
self, id: str, new_value: ibis_types.Value
Expand Down
29 changes: 21 additions & 8 deletions 29 bigframes/core/compile/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,27 @@ def _compile_node(
@_compile_node.register
def compile_join(self, node: nodes.JoinNode, ordered: bool = True):
if ordered:
left_ordered = self.compile_ordered_ir(node.left_child)
right_ordered = self.compile_ordered_ir(node.right_child)
return bigframes.core.compile.single_column.join_by_column_ordered(
left=left_ordered,
right=right_ordered,
type=node.type,
conditions=node.conditions,
)
# In general, joins are an ordering destroying operation.
# With ordering_mode = "partial", make this explicit. In
# this case, we don't need to provide a deterministic ordering.
if self.strict:
left_ordered = self.compile_ordered_ir(node.left_child)
right_ordered = self.compile_ordered_ir(node.right_child)
return bigframes.core.compile.single_column.join_by_column_ordered(
left=left_ordered,
right=right_ordered,
type=node.type,
conditions=node.conditions,
)
else:
left_unordered = self.compile_unordered_ir(node.left_child)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious if wee need to do anything to handle sort=True behavior from the pandas join? I'm guessing "no", as I suspect this would be implemented as a sort after the join.

Also, let's add a comment explaining this optimization:

Suggested change
left_unordered = self.compile_unordered_ir(node.left_child)
# In general, joins are an ordering destroying operation.
# With ordering_mode = "partial", make this explicit. In
# this case, we don't need to provide a deterministic ordering.
left_unordered = self.compile_unordered_ir(node.left_child)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And yes, sort=True sorts as an additional operation and so will still apply: https://github.com/googleapis/python-bigquery-dataframes/blob/main/bigframes/core/blocks.py#L2073-L2080

right_unordered = self.compile_unordered_ir(node.right_child)
return bigframes.core.compile.single_column.join_by_column_unordered(
left=left_unordered,
right=right_unordered,
type=node.type,
conditions=node.conditions,
).as_ordered_ir()
else:
left_unordered = self.compile_unordered_ir(node.left_child)
right_unordered = self.compile_unordered_ir(node.right_child)
Expand Down
4 changes: 3 additions & 1 deletion 4 bigframes/core/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ def order_ambiguous(self) -> bool:

@property
def explicitly_ordered(self) -> bool:
# Do not consider user pre-join ordering intent - they need to re-order post-join in unordered mode.
return False

def __hash__(self):
Expand Down Expand Up @@ -307,7 +308,8 @@ def order_ambiguous(self) -> bool:

@property
def explicitly_ordered(self) -> bool:
return all(child.explicitly_ordered for child in self.children)
# Consider concat as an ordered operations (even though input frames may not be ordered)
return True

def __hash__(self):
return self._node_hash
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.