Repository: ignite Updated Branches: refs/heads/ignite-1607 ccce82152 -> a85cb1f85
ignite-1607 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a85cb1f8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a85cb1f8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a85cb1f8 Branch: refs/heads/ignite-1607 Commit: a85cb1f856de26ee4844f907b9e0973e28fe8b5c Parents: ccce821 Author: sboikov <[email protected]> Authored: Wed Oct 21 14:01:54 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Oct 21 14:01:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 8 +++----- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a85cb1f8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 37ee080..9c0761f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -1626,12 +1626,10 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V if (storeEnabled) { GridCacheVersion ver = entry.version(); - if (entry.startVersion() == ver.order()) { - if (misses == null) - misses = new GridLeanMap<>(); + if (misses == null) + misses = new GridLeanMap<>(); - misses.put(key, ver); - } + misses.put(key, ver); } } else { http://git-wip-us.apache.org/repos/asf/ignite/blob/a85cb1f8/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 4c1136f..6e7c1ed 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 @@ -3216,6 +3216,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme checkObsolete(); if (curVer == null || curVer.equals(ver)) { + GridCacheMvcc mvcc = mvccExtras(); + + if (mvcc != null && !mvcc.isEmpty()) + return false; + if (val != this.val) { CacheObject old = rawGetOrUnmarshalUnlocked(false);
