Skip to content

Update join.py #211

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

Merged
nils-braun merged 2 commits into from
Aug 14, 2021
Merged

Update join.py #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79961e6
remove pandas
sarahyurick Aug 13, 2021
3e732a8
Update dask_sql/physical/rel/logical/join.py
sarahyurick Aug 13, 2021
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
5 changes: 2 additions & 3 deletions dask_sql/physical/rel/logical/join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from typing import List, Tuple

import dask.dataframe as dd
import pandas as pd
from dask.base import tokenize
from dask.highlevelgraph import HighLevelGraph

Expand Down Expand Up @@ -117,7 +116,7 @@ def merge_single_partitions(lhs_partition, rhs_partition):
# which is definitely not possible (java dependency, JVM start...)
lhs_partition = lhs_partition.assign(common=1)
rhs_partition = rhs_partition.assign(common=1)
merged_data = pd.merge(lhs_partition, rhs_partition, on=["common"])
merged_data = lhs_partition.merge(rhs_partition, on=["common"])

return merged_data

Expand All @@ -137,7 +136,7 @@ def merge_single_partitions(lhs_partition, rhs_partition):
name, dsk, dependencies=[df_lhs_renamed, df_rhs_renamed]
)

meta = pd.concat(
meta = dd.dispatch.concat(
[df_lhs_renamed._meta_nonempty, df_rhs_renamed._meta_nonempty], axis=1
)
# TODO: Do we know the divisions in any way here?
Expand Down