Skip to content

REF: MultiIndex._engine followup to #43370 #43421

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
merged 1 commit into from
Sep 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v1.4.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ Performance improvements
- Performance improvement in :func:`read_stata` (:issue:`43059`)
- Performance improvement in :meth:`to_datetime` with ``uint`` dtypes (:issue:`42606`)
- Performance improvement in :meth:`Series.sparse.to_coo` (:issue:`42880`)
-
- Performance improvement in indexing with a :class:`MultiIndex` indexer on another :class:`MultiIndex` (:issue:43370`)

.. ---------------------------------------------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion pandas/_libs/index.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import numpy as np

from pandas._typing import npt

from pandas import MultiIndex

class IndexEngine:
over_size_threshold: bool
def __init__(self, vgetter, n: int): ...
Expand Down Expand Up @@ -59,7 +61,7 @@ class BaseMultiIndexCodesEngine:
self,
target: npt.NDArray[np.object_],
) -> npt.NDArray[np.intp]: ...
def _extract_level_codes(self, target: object): ...
def _extract_level_codes(self, target: MultiIndex) -> np.ndarray: ...
def get_indexer_with_fill(
self,
target: np.ndarray, # np.ndarray[object] of tuples
Expand Down
12 changes: 5 additions & 7 deletions pandas/_libs/index.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -622,23 +622,22 @@ cdef class BaseMultiIndexCodesEngine:
in zip(self.levels, zt)]
return self._codes_to_ints(np.array(level_codes, dtype='uint64').T)

def get_indexer(self, target) -> np.ndarray:
def get_indexer(self, target: np.ndarray) -> np.ndarray:
"""
Returns an array giving the positions of each value of `target` in
`self.values`, where -1 represents a value in `target` which does not
appear in `self.values`

Parameters
----------
target : MultiIndex
target : np.ndarray

Returns
-------
np.ndarray[intp_t, ndim=1] of the indexer of `target` into
`self.values`
"""
lab_ints = self._extract_level_codes(target)
return self._base.get_indexer(self, lab_ints)
return self._base.get_indexer(self, target)

def get_indexer_with_fill(self, ndarray target, ndarray values,
str method, object limit) -> np.ndarray:
Expand Down Expand Up @@ -741,10 +740,9 @@ cdef class BaseMultiIndexCodesEngine:

return self._base.get_loc(self, lab_int)

def get_indexer_non_unique(self, target):
def get_indexer_non_unique(self, target: np.ndarray) -> np.ndarray:
# target: MultiIndex
lab_ints = self._extract_level_codes(target)
indexer = self._base.get_indexer_non_unique(self, lab_ints)
indexer = self._base.get_indexer_non_unique(self, target)

return indexer

Expand Down
7 changes: 3 additions & 4 deletions pandas/core/indexes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3620,9 +3620,8 @@ def _get_indexer(
else:
tgt_values = target._get_engine_target()
if target._is_multi and self._is_multi:
# error: Incompatible types in assignment (expression has type
# "Index", variable has type "ndarray[Any, Any]")
tgt_values = target # type: ignore[assignment]
tgt_values = self._engine._extract_level_codes(target)

indexer = self._engine.get_indexer(tgt_values)

return ensure_platform_int(indexer)
Expand Down Expand Up @@ -5465,7 +5464,7 @@ def get_indexer_non_unique(
# self and non-Multi target
tgt_values = target._get_engine_target()
if self._is_multi and target._is_multi:
tgt_values = target
tgt_values = self._engine._extract_level_codes(target)

indexer, missing = self._engine.get_indexer_non_unique(tgt_values)
return ensure_platform_int(indexer), ensure_platform_int(missing)
Expand Down