Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def from_table(
project_id: str,
dataset_id: str,
table_id: str,
uid_gen: guid.SequentialUIDGenerator,
uid_gen: guid.SequentialUIDGenerator | None = None,
columns: typing.Sequence[str] = (),
sql_predicate: typing.Optional[str] = None,
system_time: typing.Optional[datetime.datetime] = None,
Expand All @@ -202,6 +202,8 @@ def from_table(
if system_time
else None
)
if uid_gen is None:
uid_gen = guid.SequentialUIDGenerator()
table_alias = next(uid_gen.get_uid_stream("bft_"))
table_expr = sge.Table(
this=sql.identifier(table_id),
Expand Down
3 changes: 2 additions & 1 deletion packages/bigframes/bigframes/core/rewrite/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from bigframes.core.rewrite.implicit_align import try_row_join
from bigframes.core.rewrite.legacy_align import legacy_join_as_projection
from bigframes.core.rewrite.nullity import simplify_join
from bigframes.core.rewrite.order import bake_order, defer_order
from bigframes.core.rewrite.order import bake_order, defer_order, pull_out_order
from bigframes.core.rewrite.pruning import column_pruning
from bigframes.core.rewrite.scan_reduction import (
try_reduce_to_local_scan,
Expand Down Expand Up @@ -50,6 +50,7 @@
"rewrite_range_rolling",
"try_reduce_to_table_scan",
"bake_order",
"pull_out_order",
"try_reduce_to_local_scan",
"fold_row_counts",
"pull_out_window_order",
Expand Down
6 changes: 6 additions & 0 deletions packages/bigframes/bigframes/core/rewrite/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ def bake_order(
return node


def pull_out_order(
node: bigframes.core.nodes.BigFrameNode,
) -> Tuple[bigframes.core.nodes.BigFrameNode, bigframes.core.ordering.RowOrdering]:
return _pull_up_order(node, order_root=False)


# Makes ordering explicit in window definitions
def _pull_up_order(
root: bigframes.core.nodes.BigFrameNode,
Expand Down
Loading
Loading