Skip to content

Commit 02c8035

Browse files
Revert "disable hybrid engine unless flag set"
This reverts commit 4c968b7.
1 parent 4c968b7 commit 02c8035

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

bigframes/pandas/io/api.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ def _read_gbq_colab( # type: ignore[overload-overlap]
279279
*,
280280
pyformat_args: Optional[Dict[str, Any]] = ...,
281281
dry_run: Literal[False] = ...,
282-
use_hybrid_engine: bool = ...,
283282
) -> bigframes.dataframe.DataFrame:
284283
...
285284

@@ -290,7 +289,6 @@ def _read_gbq_colab(
290289
*,
291290
pyformat_args: Optional[Dict[str, Any]] = ...,
292291
dry_run: Literal[True] = ...,
293-
use_hybrid_engine: bool = ...,
294292
) -> pandas.Series:
295293
...
296294

@@ -300,7 +298,6 @@ def _read_gbq_colab(
300298
*,
301299
pyformat_args: Optional[Dict[str, Any]] = None,
302300
dry_run: bool = False,
303-
use_hybrid_engine: bool = False,
304301
) -> bigframes.dataframe.DataFrame | pandas.Series:
305302
"""A Colab-specific version of read_gbq.
306303
@@ -315,9 +312,7 @@ def _read_gbq_colab(
315312
dry_run (bool):
316313
If True, estimates the query results size without returning data.
317314
The return will be a pandas Series with query metadata.
318-
use_hybrid_engine (bool):
319-
If True, and session not started, new session started will use
320-
hybrid execution which pushes some execution to local cpu.
315+
321316
Returns:
322317
Union[bigframes.dataframe.DataFrame, pandas.Series]:
323318
A BigQuery DataFrame if `dry_run` is False, otherwise a pandas Series.
@@ -350,7 +345,7 @@ def _read_gbq_colab(
350345
dry_run=True,
351346
)
352347
_set_default_session_location_if_possible_deferred_query(create_query)
353-
if use_hybrid_engine and not config.options.bigquery._session_started:
348+
if not config.options.bigquery._session_started:
354349
config.options.bigquery.enable_polars_execution = True
355350

356351
return global_session.with_default_session(

tests/system/small/session/test_read_gbq_colab.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ def test_read_gbq_colab_fresh_session_is_hybrid():
7777
GROUP BY name
7878
ORDER BY total DESC
7979
LIMIT 300
80-
""",
81-
use_hybrid_engine=True,
80+
"""
8281
)
8382
session = df._session
8483
executions_before_python = session._metrics.execution_count

0 commit comments

Comments
 (0)