undo changes in tile.py

Author: chelsea-lin

bigframes/core/reshape/tile.py

@@ -22,6 +22,8 @@
 import pandas as pd
 
 import bigframes
+import bigframes.constants
+import bigframes.core.expression as ex
 import bigframes.core.ordering as order
 import bigframes.core.utils as utils
 import bigframes.core.window_spec as window_specs
@@ -163,6 +165,7 @@ def qcut(
             f"Only duplicates='drop' is supported in BigQuery DataFrames so far. {constants.FEEDBACK_LINK}"
         )
     block = x._block
+    label = block.col_id_to_label[x._value_column]
     block, nullity_id = block.apply_unary_op(x._value_column, ops.notnull_op)
     block, result = block.apply_window_op(
         x._value_column,
@@ -172,6 +175,9 @@ def qcut(
             ordering=(order.ascending_over(x._value_column),),
         ),
     )
+    block, result = block.project_expr(
+        ops.where_op.as_expr(result, nullity_id, ex.const(None)), label=label
+    )
     return bigframes.series.Series(block.select_column(result))
 
 

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

@@ -23,29 +23,39 @@ WITH `bfcte_0` AS (
 ), `bfcte_3` AS (
   SELECT
     *,
-    NOT `int64_col` IS NULL AS `bfcol_9`
+    IF(`bfcol_4`, `bfcol_5`, NULL) AS `bfcol_6`
   FROM `bfcte_2`
 ), `bfcte_4` AS (
+  SELECT
+    *,
+    NOT `int64_col` IS NULL AS `bfcol_10`
+  FROM `bfcte_3`
+), `bfcte_5` AS (
   SELECT
     *,
     CASE
-      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_9` ORDER BY `int64_col` ASC) < 0
+      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_10` ORDER BY `int64_col` ASC) < 0
       THEN NULL
-      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_9` ORDER BY `int64_col` ASC) <= 0.25
+      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_10` ORDER BY `int64_col` ASC) <= 0.25
       THEN 0
-      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_9` ORDER BY `int64_col` ASC) <= 0.5
+      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_10` ORDER BY `int64_col` ASC) <= 0.5
       THEN 1
-      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_9` ORDER BY `int64_col` ASC) <= 0.75
+      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_10` ORDER BY `int64_col` ASC) <= 0.75
       THEN 2
-      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_9` ORDER BY `int64_col` ASC) <= 1
+      WHEN PERCENT_RANK() OVER (PARTITION BY `bfcol_10` ORDER BY `int64_col` ASC) <= 1
       THEN 3
       ELSE NULL
-    END AS `bfcol_10`
-  FROM `bfcte_3`
+    END AS `bfcol_11`
+  FROM `bfcte_4`
+), `bfcte_6` AS (
+  SELECT
+    *,
+    IF(`bfcol_10`, `bfcol_11`, NULL) AS `bfcol_12`
+  FROM `bfcte_5`
 )
 SELECT
   `rowindex`,
   `int64_col`,
-  `bfcol_5` AS `qcut_w_int`,
-  `bfcol_10` AS `qcut_w_list`
-FROM `bfcte_4`
+  `bfcol_6` AS `qcut_w_int`,
+  `bfcol_12` AS `qcut_w_list`
+FROM `bfcte_6`