Skip to content

Commit 9d52a1e

Browse files
committed
BUG: implement new engine for codes-based MultiIndex indexing
closes pandas-dev#18519 closes pandas-dev#18818 closes pandas-dev#18520 closes pandas-dev#18485 closes pandas-dev#15994
1 parent e76b200 commit 9d52a1e

File tree

2 files changed

+110
-10
lines changed

2 files changed

+110
-10
lines changed

doc/source/whatsnew/v0.23.0.txt

+3
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ Indexing
318318
- Bug in :func:`MultiIndex.get_level_values` which would return an invalid index on level of ints with missing values (:issue:`17924`)
319319
- Bug in :func:`MultiIndex.remove_unused_levels` which would fill nan values (:issue:`18417`)
320320
- Bug in :func:`MultiIndex.from_tuples`` which would fail to take zipped tuples in python3 (:issue:`18434`)
321+
- Bug in :func:`MultiIndex.get_loc`` which would fail to automatically cast values between float and int (:issue:`18818`, :issue:`15994`)
322+
- Bug in :func:`MultiIndex.get_loc`` which would fail to locate keys containing NaN (:issue:`18485`)
323+
- Bug in :func:`MultiIndex.get_loc`` in large :class:`MultiIndex` which would fail when levels had different dtypes (:issue:`18520`)
321324
- Bug in :class:`Index` construction from list of mixed type tuples (:issue:`18505`)
322325
- Bug in :func:`Index.drop` when passing a list of both tuples and non-tuples (:issue:`18304`)
323326
- Bug in :class:`IntervalIndex` where empty and purely NA data was constructed inconsistently depending on the construction method (:issue:`18421`)

pandas/core/indexes/multi.py

+107-10
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,104 @@
5050
target_klass='MultiIndex or list of tuples'))
5151

5252

53+
class BaseMultiIndexCodesEngine(object):
54+
def __init__(self, levels, labels, offsets, **kwargs):
55+
self._levels = levels
56+
self._labels = labels
57+
self._offsets = offsets
58+
59+
# Map each combination to an integer
60+
codes = (np.array(labels, dtype='int64').T + 1).astype('uint64')
61+
lab_ints = self._codes_to_ints(codes)
62+
63+
# Initialize underlying index
64+
self._base.__init__(self, lambda: lab_ints, len(lab_ints), **kwargs)
65+
66+
def get_indexer(self, target, method=None, limit=None):
67+
level_codes = [self._levels[lev].get_indexer(codes, method=method) + 1
68+
for lev, codes in enumerate(zip(*target))]
69+
70+
keys_int = self._codes_to_ints(np.array(level_codes, dtype='uint64').T)
71+
72+
if method is not None:
73+
# keys must be sorted - the engine already is
74+
order = np.argsort(keys_int)
75+
keys_int = keys_int[order]
76+
sup_meth = getattr(self._base, 'get_{}_indexer'.format(method))
77+
indexer = sup_meth(self, keys_int, limit=limit)
78+
indexer = indexer[order]
79+
else:
80+
indexer = self._base.get_indexer(self, keys_int)
81+
82+
return indexer
83+
84+
def get_loc(self, key):
85+
if libindex.is_definitely_invalid_key(key):
86+
raise TypeError("'{key}' is an invalid key".format(key=key))
87+
if not isinstance(key, tuple):
88+
raise KeyError(key)
89+
try:
90+
idces = [0 if isna(val) else self._levels[lev].get_loc(val) + 1
91+
for lev, val in enumerate(key)]
92+
except KeyError:
93+
raise KeyError(key)
94+
idces = np.array(idces, ndmin=2, dtype='uint64')
95+
96+
key_int = self._codes_to_ints(idces)[0]
97+
98+
return self._base.get_loc(self, key_int)
99+
100+
def get_indexer_non_unique(self, target):
101+
# This needs to be overridden just because the default one works on
102+
# target._values, and target can be itself a MultiIndex.
103+
104+
level_codes = [self._levels[lev].get_indexer(codes) + 1
105+
for lev, codes in enumerate(zip(*target))]
106+
codes = np.array(level_codes, dtype='uint64').T
107+
keys_int = self._codes_to_ints(codes)
108+
109+
indexer = self._base.get_indexer_non_unique(self, keys_int)
110+
111+
return indexer
112+
113+
def __contains__(self, val):
114+
try:
115+
self.get_loc(val)
116+
return True
117+
except (KeyError, TypeError, ValueError):
118+
return False
119+
120+
121+
class MultiIndexUIntEngine(BaseMultiIndexCodesEngine, libindex.UInt64Engine):
122+
"""
123+
Manage a MultiIndex by mapping label combinations to positive integers.
124+
"""
125+
_base = libindex.UInt64Engine
126+
_type = 'uint64'
127+
128+
def _codes_to_ints(self, codes):
129+
# Shift:
130+
codes <<= self._offsets
131+
# Now sum and OR are in fact interchangeable:
132+
return np.bitwise_or.reduce(codes, axis=1)
133+
134+
135+
class MultiIndexPyIntEngine(BaseMultiIndexCodesEngine, libindex.ObjectEngine):
136+
"""
137+
In those (extreme) cases in which the number of possible label combinations
138+
overflows the 64 bits integers, use an ObjectEngine containing Python
139+
integers.
140+
"""
141+
_base = libindex.ObjectEngine
142+
_type = 'object'
143+
144+
def _codes_to_ints(self, codes):
145+
# Shift:
146+
codes = codes.astype('object') << self._offsets
147+
# Now sum and OR are in fact interchangeable:
148+
return np.bitwise_or.reduce(codes, axis=1)
149+
150+
53151
class MultiIndex(Index):
54152
"""
55153
A multi-level, or hierarchical, index object for pandas objects
@@ -691,16 +789,15 @@ def _get_level_number(self, level):
691789

692790
@cache_readonly
693791
def _engine(self):
792+
# Find powers of 2 which dominate level sizes - including -1 for NaN:
793+
lev_bits = np.cumsum(np.ceil(np.log2([len(l) + 1 for l in
794+
self.levels[::-1]])))[::-1]
795+
offsets = np.concatenate([lev_bits[1:], [0]]).astype('uint')
694796

695-
# choose our engine based on our size
696-
# the hashing based MultiIndex for larger
697-
# sizes, and the MultiIndexOjbect for smaller
698-
# xref: https://github.com/pandas-dev/pandas/pull/16324
699-
l = len(self)
700-
if l > 10000:
701-
return libindex.MultiIndexHashEngine(lambda: self, l)
702-
703-
return libindex.MultiIndexObjectEngine(lambda: self.values, l)
797+
if lev_bits[0] > 64:
798+
# The levels would overflow a 64 bit integer - use Python integers:
799+
return MultiIndexPyIntEngine(self.levels, self.labels, offsets)
800+
return MultiIndexUIntEngine(self.levels, self.labels, offsets)
704801

705802
@property
706803
def values(self):
@@ -1889,7 +1986,7 @@ def get_indexer(self, target, method=None, limit=None, tolerance=None):
18891986
if tolerance is not None:
18901987
raise NotImplementedError("tolerance not implemented yet "
18911988
'for MultiIndex')
1892-
indexer = self._get_fill_indexer(target, method, limit)
1989+
indexer = self._engine.get_indexer(target, method, limit)
18931990
elif method == 'nearest':
18941991
raise NotImplementedError("method='nearest' not implemented yet "
18951992
'for MultiIndex; see GitHub issue 9365')

0 commit comments

Comments
 (0)