Fix: Handle empty index in unpivot with identity mapping

Author: shuoweil

bigframes/core/blocks.py

@@ -3435,7 +3435,15 @@ def unpivot(
     # Last column is offsets
     if not labels_array.column_ids:
         # Handle empty column_ids case for multimodal DataFrames
-        return array_value, (tuple(), tuple(), tuple(passthrough_columns))
+        # When no index columns exist, return original array_value with identity mappings
+        value_cols = [
+            col for col in array_value.column_ids if col not in passthrough_columns
+        ]
+        return array_value, (
+            tuple(),
+            tuple(value_cols),
+            tuple(passthrough_columns),
+        )
     index_col_ids = [labels_mapping[col] for col in labels_array.column_ids[:-1]]
     explode_offsets_id = labels_mapping[labels_array.column_ids[-1]]
 
@@ -3462,7 +3470,7 @@ def unpivot(
     joined_array, unpivot_col_ids = joined_array.compute_values(unpivot_exprs)
 
     return joined_array.select_columns(
-        [*index_col_ids, *unpivot_col_ids, *new_passthrough_cols]
+        [*index_col_ids, *unpivot_col_ids, *new_passthrough_cols], allow_renames=True
     ), (tuple(index_col_ids), tuple(unpivot_col_ids), tuple(new_passthrough_cols))
 
 

tests/unit/core/test_blocks_unpivot.py

@@ -58,20 +58,21 @@ def test_unpivot_with_empty_row_labels(mock_session):
     import pyarrow as pa
 
     # Create a dummy ArrayValue
-    df = pd.DataFrame({"a": [1, 2, 3]})
+    df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
     pa_table = pa.Table.from_pandas(df)
     array_value = blocks.core.ArrayValue.from_pyarrow(pa_table, session=mock_session)
 
     # Call unpivot with an empty pd.Index
-    unpivot_result, (index_cols, unpivot_cols, passthrough_cols) = blocks.unpivot(
+    unpivot_result, (index_cols, value_cols, passthrough_cols) = blocks.unpivot(
         array_value,
         row_labels=pd.Index([]),
         unpivot_columns=[("a",)],
+        passthrough_columns=["b"],
     )
 
     # The expected behavior is that the unpivot operation does nothing and returns
-    # the original array_value and empty column tuples.
+    # the original array_value and identity mappings.
     assert unpivot_result is array_value
     assert index_cols == tuple()
-    assert unpivot_cols == tuple()
-    assert passthrough_cols == tuple()
+    assert value_cols == ("a",)
+    assert passthrough_cols == ("b",)