-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
ENH: Arrow backed string array - implement factorize() method without casting to objects #38007
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.
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
jorisvandenbossche
merged 15 commits into
pandas-dev:master
from
simonjayhawkins:factorize
Mar 2, 2021
Merged
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
c53a3c2
moreless copy/paste from fletcher
simonjayhawkins b7d0ab8
use docstring from base class
simonjayhawkins 154496a
remove redundant type check
simonjayhawkins c545970
Merge remote-tracking branch 'upstream/master' into factorize
simonjayhawkins 6e3aac8
Merge remote-tracking branch 'upstream/master' into factorize
simonjayhawkins 73c7de9
ignore new mypy error
simonjayhawkins 42ca9c3
update algorithms.Factorize.time_factorize
simonjayhawkins a251537
test for arrays with 2 chunks
simonjayhawkins dbc8253
Merge remote-tracking branch 'upstream/master' into factorize
simonjayhawkins ea59c38
fix failing test_factorize_equivalence
simonjayhawkins 7d98727
fix failing test_factorize_empty
simonjayhawkins 0023f08
address dtype comment
simonjayhawkins 6a28414
move ArrowStringDtype import inside try/except
simonjayhawkins c4db20d
Merge remote-tracking branch 'upstream/master' into factorize
simonjayhawkins 88ab4f4
Merge remote-tracking branch 'upstream/master' into factorize
simonjayhawkins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,12 @@ | ||
from __future__ import annotations | ||
|
||
from distutils.version import LooseVersion | ||
from typing import TYPE_CHECKING, Any, Sequence, Type, Union | ||
from typing import TYPE_CHECKING, Any, Sequence, Tuple, Type, Union | ||
|
||
import numpy as np | ||
|
||
from pandas._libs import lib, missing as libmissing | ||
from pandas.util._decorators import doc | ||
from pandas.util._validators import validate_fillna_kwargs | ||
|
||
from pandas.core.dtypes.base import ExtensionDtype | ||
|
@@ -15,10 +16,12 @@ | |
from pandas.api.types import ( | ||
is_array_like, | ||
is_bool_dtype, | ||
is_int64_dtype, | ||
is_integer, | ||
is_integer_dtype, | ||
is_scalar, | ||
) | ||
from pandas.core.algorithms import factorize | ||
from pandas.core.arraylike import OpsMixin | ||
from pandas.core.arrays.base import ExtensionArray | ||
from pandas.core.indexers import check_array_indexer, validate_indices | ||
|
@@ -252,9 +255,20 @@ def __len__(self) -> int: | |
""" | ||
return len(self._data) | ||
|
||
@classmethod | ||
def _from_factorized(cls, values, original): | ||
return cls._from_sequence(values) | ||
@doc(ExtensionArray.factorize) | ||
def factorize(self, na_sentinel: int = -1) -> Tuple[np.ndarray, ExtensionArray]: | ||
if self._data.num_chunks == 1: | ||
encoded = self._data.chunk(0).dictionary_encode() | ||
indices = encoded.indices.to_pandas() | ||
if indices.dtype.kind == "f": | ||
indices[np.isnan(indices)] = na_sentinel | ||
indices = indices.astype(int) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. int -> np.int64 |
||
if not is_int64_dtype(indices): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you can just do |
||
indices = indices.astype(np.int64) | ||
return indices.values, type(self)(encoded.dictionary) | ||
else: | ||
np_array = self._data.to_pandas().values | ||
return factorize(np_array, na_sentinel=na_sentinel) | ||
|
||
@classmethod | ||
def _concat_same_type(cls, to_concat) -> ArrowStringArray: | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nowadays,
dictionary_encode
works fine for ChunkedArrays as well, so I am not sure thisif
statement is actually needed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tooks a stab at that in
fletcher
to let CI verify this assumption: Seems to work withpyarrow
0.17-2.0 xhochy/fletcher#206