CLN: have _consolidate_inplace invalidate the cache when needed

Author: jreback

pandas/core/frame.py

@@ -2100,15 +2100,10 @@ def _slice(self, slobj, axis=0, raise_on_error=False):
         else:
             mgr_axis = 0
 
-        # Super bad smell, need to review all this cache inval / block business
-        blocks_before = len(self._data.blocks)
+        self._consolidate_inplace()
         new_data = self._data.get_slice(slobj, axis=mgr_axis,
                                         raise_on_error=raise_on_error)
 
-        # Internal consolidation requires cache invalidation
-        if len(self._data.blocks) != blocks_before:
-            self._clear_item_cache()
-
         return self._constructor(new_data)
 
     def _box_item_values(self, key, values):

pandas/core/generic.py

@@ -747,8 +747,8 @@ def _expand_axes(self, key):
     # Consolidation of internals
 
     def _consolidate_inplace(self):
-        self._clear_item_cache()
-        self._data = self._data.consolidate()
+        f = lambda: self._data.consolidate()
+        self._data = self._protect_consolidate(f)
 
     def consolidate(self, inplace=False):
         """
@@ -768,7 +768,8 @@ def consolidate(self, inplace=False):
         if inplace:
             self._consolidate_inplace()
         else:
-            cons_data = self._data.consolidate()
+            f = lambda: self._data.consolidate()
+            cons_data = self._protect_consolidate(f)
             if cons_data is self._data:
                 cons_data = cons_data.copy()
             return self._constructor(cons_data)