ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.6 Unwrap offheap object before pass it to continuous query
Date Fri, 13 May 2016 13:19:42 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.6 bd79316a2 -> 3319d2a7c


ignite-1.6 Unwrap offheap object before pass it to continuous query


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3319d2a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3319d2a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3319d2a7

Branch: refs/heads/ignite-1.6
Commit: 3319d2a7c2c3bda0a91cacf248727baf2a47961e
Parents: bd79316
Author: sboikov <sboikov@gridgain.com>
Authored: Fri May 13 16:14:54 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri May 13 16:14:54 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheMapEntry.java      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3319d2a7/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 2a29657..eb3d903 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
@@ -2516,14 +2516,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
 
             // Continuous query filter should be perform under lock.
             if (lsnrs != null) {
-                CacheObject evtVal = updated;
-                CacheObject evtOldVal = oldVal;
-
-                if (isOffHeapValuesOnly()) {
-                    evtVal = cctx.toCacheObject(cctx.unwrapTemporary(evtVal));
-
-                    evtOldVal = cctx.toCacheObject(cctx.unwrapTemporary(evtOldVal));
-                }
+                CacheObject evtVal = cctx.unwrapTemporary(updated);
+                CacheObject evtOldVal = cctx.unwrapTemporary(oldVal);
 
                 cctx.continuousQueries().onEntryUpdated(lsnrs, key, evtVal, evtOldVal, internal,
                     partition(), primary, false, updateCntr0, fut, topVer);


Mime
View raw message