Repository: ignite Updated Branches: refs/heads/ignite-950-new 3ef78a3dc -> 3a144c6e8
IGNITE-950-new - Fixing keepBinary behavior. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a144c6e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a144c6e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a144c6e Branch: refs/heads/ignite-950-new Commit: 3a144c6e8d94969a3195dbb7641e2c225f0ad4ae Parents: 3ef78a3 Author: Alexey Goncharuk <[email protected]> Authored: Sun Nov 1 15:41:06 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Sun Nov 1 15:41:06 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 10 +++++----- .../cache/datastructures/CacheDataStructuresManager.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3a144c6e/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 00c2893..c8bc794 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 @@ -1183,7 +1183,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.isLocal() || cctx.isReplicated() || (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdated(this, key, val, old, false); - cctx.dataStructures().onEntryUpdated(key, false); + cctx.dataStructures().onEntryUpdated(key, false, keepPortable); } if (log.isDebugEnabled()) @@ -1352,7 +1352,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.isLocal() || cctx.isReplicated() || (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdated(this, key, null, old, false); - cctx.dataStructures().onEntryUpdated(key, true); + cctx.dataStructures().onEntryUpdated(key, true, keepPortable); } // Persist outside of synchronization. The correctness of the @@ -1695,7 +1695,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.continuousQueries().onEntryUpdated(this, key, val, old, false); - cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE); + cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepPortable); if (intercept) { if (op == GridCacheOperation.UPDATE) @@ -2312,7 +2312,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.isReplicated() || primary) cctx.continuousQueries().onEntryUpdated(this, key, val, oldVal, false); - cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE); + cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepPortable); if (intercept) { if (op == GridCacheOperation.UPDATE) @@ -3161,7 +3161,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.isLocal() || cctx.isReplicated() || cctx.affinity().primary(cctx.localNode(), key, topVer)) cctx.continuousQueries().onEntryUpdated(this, key, val, null, preload); - cctx.dataStructures().onEntryUpdated(key, false); + cctx.dataStructures().onEntryUpdated(key, false, true); } if (cctx.store().isLocal()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/3a144c6e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 1ff4575..edad586 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -312,8 +312,8 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { * @param key Key. * @param rmv {@code True} if entry was removed. */ - public void onEntryUpdated(KeyCacheObject key, boolean rmv) { - Object key0 = key.value(cctx.cacheObjectContext(), false); + public void onEntryUpdated(KeyCacheObject key, boolean rmv, boolean keepPortable) { + Object key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false); if (key0 instanceof GridCacheSetItemKey) onSetItemUpdated((GridCacheSetItemKey)key0, rmv);
