Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(datasets): Removed databricks-connect by default in notebooks #861

Closed
wants to merge 2 commits into from
Closed

feat(datasets): Removed databricks-connect by default in notebooks #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d8042
Removed databricks-connect by default in notebooks
MigQ2 Oct 1, 2024
8a1a704
Fixed DBR version constant
MigQ2 Oct 1, 2024
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
3 changes: 3 additions & 0 deletions kedro-datasets/RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
* Fixed deprecated load and save approaches of GBQTableDataset and GBQQueryDataset by invoking save and load directly over `pandas-gbq` lib

## Breaking Changes
* Now `_get_spark()` does not use `databricks-connect` by default when run in a Databricks notebook

## Community contributions
Many thanks to the following Kedroids for contributing PRs to this release:
* [Brandon Meek](https://github.com/bpmeek)
* [yury-fedotov](https://github.com/yury-fedotov)
* [gitgud5000](https://github.com/gitgud5000)
* [janickspirig](https://github.com/janickspirig)
* [Galen Seilis](https://github.com/galenseilis)
* [MigQ2](https://github.com/MigQ2)


# Release 4.1.0
Expand Down
11 changes: 8 additions & 3 deletions kedro-datasets/kedro_datasets/spark/spark_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ def _get_spark() -> Any:
extended configuration mechanisms and notebook compatibility,
otherwise we use classic pyspark.
"""
try:
MIN_DBCONNECT_V2_VERSION = 13
if (
"DATABRICKS_RUNTIME_VERSION" in os.environ
and int(os.environ["DATABRICKS_RUNTIME_VERSION"].split(".")[0])
>= MIN_DBCONNECT_V2_VERSION
):
# When using databricks-connect >= 13.0.0 (a.k.a databricks-connect-v2)
# the remote session is instantiated using the databricks module
# If the databricks-connect module is installed, we use a remote session
Expand All @@ -47,9 +52,9 @@ def _get_spark() -> Any:
# We can't test this as there's no Databricks test env available
spark = DatabricksSession.builder.getOrCreate() # pragma: no cover

except ImportError:
else:
# For "normal" spark sessions that don't use databricks-connect
# we get spark normally
# or for databricks-connect<13 we get spark "normally"
spark = SparkSession.builder.getOrCreate()

return spark
Expand Down
Loading