Merge pull request pandas-dev#4070 from jreback/iloc_perf

PERF: optimize iloc for unique case

Author: jreback

pandas/core/frame.py

@@ -1981,7 +1981,8 @@ def _ixs(self, i, axis=0, copy=False):
                 if isinstance(label, Index):
 
                     # a location index by definition
-                    return self.reindex(label, takeable=True)
+                    i = _maybe_convert_indices(i, len(self._get_axis(axis)))
+                    return self.reindex(i, takeable=True)
                 else:
                     try:
                         new_values = self._data.fast_2d_xs(i, copy=copy)

pandas/core/index.py

@@ -938,27 +938,31 @@ def reindex(self, target, method=None, level=None, limit=None,
             _, indexer, _ = self._join_level(target, level, how='right',
                                              return_indexers=True)
         else:
+
             if self.equals(target):
                 indexer = None
-
+                
                 # to avoid aliasing an existing index
                 if copy_if_needed and target.name != self.name and self.name is not None:
                     if target.name is None:
                         target = self.copy()
 
             else:
+
+                if takeable:
+                    if method is not None or limit is not None:
+                        raise ValueError("cannot do a takeable reindex with "
+                                         "with a method or limit")
+                    return self[target], target
+
                 if self.is_unique:
                     indexer = self.get_indexer(target, method=method,
                                                limit=limit)
                 else:
                     if method is not None or limit is not None:
                         raise ValueError("cannot reindex a non-unique index "
                                          "with a method or limit")
-                    if takeable:
-                        indexer = target
-                        missing = (target>=len(target)).nonzero()[0]
-                    else:
-                        indexer, missing = self.get_indexer_non_unique(target)
+                    indexer, _ = self.get_indexer_non_unique(target)
 
         return target, indexer
 

pandas/core/series.py

@@ -21,7 +21,8 @@
                                 _NS_DTYPE, _TD_DTYPE)
 from pandas.core.index import (Index, MultiIndex, InvalidIndexError,
                                _ensure_index, _handle_legacy_indexes)
-from pandas.core.indexing import _SeriesIndexer, _check_bool_indexer, _check_slice_bounds
+from pandas.core.indexing import (_SeriesIndexer, _check_bool_indexer,
+                                  _check_slice_bounds, _maybe_convert_indices)
 from pandas.tseries.index import DatetimeIndex
 from pandas.tseries.period import PeriodIndex, Period
 from pandas.util import py3compat
@@ -598,7 +599,8 @@ def _ixs(self, i, axis=0):
             else:
                 label = self.index[i]
                 if isinstance(label, Index):
-                    return self.reindex(label, takeable=True)
+                    i = _maybe_convert_indices(i, len(self))
+                    return self.reindex(i, takeable=True)
                 else:
                     return _index.get_value_at(self, i)