File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -1266,7 +1266,6 @@ void CacheAllocator<CacheTrait>::moveRegularItemWithSync(
12661266 // ??? util::LatencyTracker tracker{stats_.evictRegularLatency_};
12671267
12681268 XDCHECK_EQ (newItemHdl->getSize (), oldItem.getSize ());
1269- XDCHECK_NE (getTierId (oldItem), getTierId (*newItemHdl));
12701269
12711270 // take care of the flags before we expose the item to be accessed. this
12721271 // will ensure that when another thread removes the item from RAM, we issue
@@ -3083,9 +3082,14 @@ bool CacheAllocator<CacheTrait>::tryMovingForSlabRelease(
30833082 ? moveChainedItem (oldItem.asChainedItem (), newItemHdl)
30843083 : moveRegularItem (oldItem, newItemHdl);
30853084 } else {
3086- // TODO: add support for chained items
3087- moveRegularItemWithSync (oldItem, newItemHdl);
3088- return true ;
3085+ if (oldItem.isChainedItem () || oldItem.hasChainedItem ()) {
3086+ // TODO: add support for chained items
3087+ return false ;
3088+ } else {
3089+ moveRegularItemWithSync (oldItem, newItemHdl);
3090+ removeFromMMContainer (oldItem);
3091+ return true ;
3092+ }
30893093 }
30903094}
30913095
You can’t perform that action at this time.
0 commit comments