You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/10 13:59:12 UTC
ignite git commit: Do not evict removed entries,
otherwise removes can be lost.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 403ac1f14 -> 55ac6e71e
Do not evict removed entries, otherwise removes can be lost.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55ac6e71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55ac6e71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55ac6e71
Branch: refs/heads/ignite-3477
Commit: 55ac6e71e68dc1ce66edeee146da0073d1bf10f9
Parents: 403ac1f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 10 16:59:17 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 10 16:59:17 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/55ac6e71/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 3363124..ca54ff2 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
@@ -3731,6 +3731,10 @@ 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;
+
if (!hasReaders() && markObsolete0(obsoleteVer, false, null)) {
// Nullify value after swap.
value(null);
@@ -3767,6 +3771,10 @@ 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;
+
if (!hasReaders() && markObsolete0(obsoleteVer, false, null)) {
// Nullify value after swap.
value(null);