Skip to content

Speed up StringDtype arrow implementation for merge #54510

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
merged 5 commits into from
Aug 22, 2023
Merged

Speed up StringDtype arrow implementation for merge #54510

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b96945
Speed up StringDtype arrow implementation
phofl Aug 12, 2023
c05918e
Fixups
phofl Aug 12, 2023
97cbdbb
Fixups
phofl Aug 12, 2023
f592c48
Update
phofl Aug 16, 2023
b0b9962
Update
phofl Aug 21, 2023
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
6 changes: 5 additions & 1 deletion pandas/core/reshape/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
ExtensionArray,
)
from pandas.core.arrays._mixins import NDArrayBackedExtensionArray
from pandas.core.arrays.string_ import StringDtype
import pandas.core.common as com
from pandas.core.construction import (
ensure_wrapped_if_datetimelike,
Expand Down Expand Up @@ -2407,13 +2408,16 @@ def _factorize_keys(
or is_string_dtype(lk.dtype)
and not sort
)
or (isinstance(lk.dtype, StringDtype) and lk.dtype.storage == "pyarrow")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the compound if statement here is non-obvious. can it be de-compounded by moving the pyarrow/string case up above this one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah not a problem.

Good to merge then?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have tests that hit the affected cases? if so then yes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, test_merge_string_dtype for example

):
lk, _ = lk._values_for_factorize()

# error: Item "ndarray" of "Union[Any, ndarray]" has no attribute
# "_values_for_factorize"
rk, _ = rk._values_for_factorize() # type: ignore[union-attr]
elif isinstance(lk.dtype, ArrowDtype) and is_string_dtype(lk.dtype):
elif (isinstance(lk.dtype, ArrowDtype) and is_string_dtype(lk.dtype)) or (
isinstance(lk.dtype, StringDtype) and lk.dtype.storage == "pyarrow"
):
import pyarrow as pa
import pyarrow.compute as pc

Expand Down