restore logic to drop window order if not needed

Author: TrevorBergeron

bigframes/core/compile/sqlglot/aggregations/binary_compiler.py

@@ -33,6 +33,8 @@ def compile(
     right: typed_expr.TypedExpr,
     window: typing.Optional[window_spec.WindowSpec] = None,
 ) -> sge.Expression:
+    if op.order_independent and (window is not None) and window.is_unbounded:
+        window = window.without_order()
     return BINARY_OP_REGISTRATION[op](op, left, right, window=window)
 
 

bigframes/core/compile/sqlglot/aggregations/nullary_compiler.py

@@ -30,6 +30,8 @@ def compile(
     op: agg_ops.WindowOp,
     window: typing.Optional[window_spec.WindowSpec] = None,
 ) -> sge.Expression:
+    if op.order_independent and (window is not None) and window.is_unbounded:
+        window = window.without_order()
     return NULLARY_OP_REGISTRATION[op](op, window=window)
 
 

bigframes/core/compile/sqlglot/aggregations/unary_compiler.py

@@ -36,6 +36,8 @@ def compile(
     column: typed_expr.TypedExpr,
     window: typing.Optional[window_spec.WindowSpec] = None,
 ) -> sge.Expression:
+    if op.order_independent and (window is not None) and window.is_unbounded:
+        window = window.without_order()
     return UNARY_OP_REGISTRATION[op](op, column, window=window)
 
 

bigframes/core/compile/sqlglot/sqlglot_ir.py

@@ -539,7 +539,7 @@ def _select_to_cte(self) -> tuple[sge.Select, sge.Identifier]:
         cte_name = sge.to_identifier(
             next(self.uid_gen.get_uid_stream("bfcte_")), quoted=self.quoted
         )
-        select_expr = self.expr._as_select().copy()
+        select_expr = self._as_select().copy()
         select_expr, existing_ctes = _pop_query_ctes(select_expr)
         new_cte = sge.CTE(
             this=select_expr,

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_all_w_window/out.sql

@@ -1,9 +1,3 @@
 SELECT
-  COALESCE(
-    LOGICAL_AND(`bool_col`) OVER (
-      ORDER BY `bool_col` ASC NULLS LAST
-      ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-    ),
-    TRUE
-  ) AS `agg_bool`
+  COALESCE(LOGICAL_AND(`bool_col`) OVER (), TRUE) AS `agg_bool`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_any_value/window_out.sql

@@ -1,6 +1,3 @@
 SELECT
-  ANY_VALUE(`int64_col`) OVER (
-    ORDER BY `int64_col` DESC
-    ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-  ) AS `agg_int64`
+  ANY_VALUE(`int64_col`) OVER () AS `agg_int64`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_any_value/window_partition_out.sql

@@ -1,7 +1,3 @@
 SELECT
-  ANY_VALUE(`int64_col`) OVER (
-    PARTITION BY `string_col`
-    ORDER BY `int64_col` ASC NULLS LAST
-    ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-  ) AS `agg_int64`
+  ANY_VALUE(`int64_col`) OVER (PARTITION BY `string_col`) AS `agg_int64`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_any_w_window/out.sql

@@ -1,9 +1,3 @@
 SELECT
-  COALESCE(
-    LOGICAL_OR(`bool_col`) OVER (
-      ORDER BY `bool_col` ASC NULLS LAST
-      ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-    ),
-    FALSE
-  ) AS `agg_bool`
+  COALESCE(LOGICAL_OR(`bool_col`) OVER (), FALSE) AS `agg_bool`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_count/window_out.sql

@@ -1,6 +1,3 @@
 SELECT
-  COUNT(`int64_col`) OVER (
-    ORDER BY `int64_col` ASC NULLS LAST
-    ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-  ) AS `agg_int64`
+  COUNT(`int64_col`) OVER () AS `agg_int64`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`

tests/unit/core/compile/sqlglot/aggregations/snapshots/test_unary_compiler/test_count/window_partition_out.sql

@@ -1,7 +1,3 @@
 SELECT
-  COUNT(`int64_col`) OVER (
-    PARTITION BY `string_col`
-    ORDER BY `int64_col` DESC
-    ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-  ) AS `agg_int64`
+  COUNT(`int64_col`) OVER (PARTITION BY `string_col`) AS `agg_int64`
 FROM `bigframes-dev`.`sqlglot_test`.`scalar_types`