Do not evict removed entries, otherwise removes can be lost. Rollback due to test failings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29187ef6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29187ef6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29187ef6 Branch: refs/heads/ignite-5232-1.7.2 Commit: 29187ef6b663eafe67eaaaf38e4c09fc244ac7aa Parents: b77428d Author: dkarachentsev <[email protected]> Authored: Wed May 24 17:31:27 2017 +0300 Committer: dkarachentsev <[email protected]> Committed: Wed May 24 17:31:27 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/29187ef6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index c8b8cd1..58b4ae3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -4300,10 +4300,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (obsoleteVersionExtras() != null) return true; - // TODO GG-11241: need keep removed entries in heap map, otherwise removes can be lost. - if (cctx.deferredDelete() && deletedUnlocked()) - return false; - CacheObject prev = saveOldValueUnlocked(false); if (!hasReaders() && markObsolete0(obsoleteVer, false, null)) { @@ -4362,10 +4358,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme // Version has changed since entry passed the filter. Do it again. continue; - // TODO GG-11241: need keep removed entries in heap map, otherwise removes can be lost. - if (cctx.deferredDelete() && deletedUnlocked()) - return false; - CacheObject prevVal = saveValueForIndexUnlocked(); if (!hasReaders() && markObsolete0(obsoleteVer, false, null)) {
