ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [24/50] [abbrv] incubator-ignite git commit: #ignite-333: Remove from swap on clearLocally.
Date Mon, 16 Mar 2015 03:40:16 GMT
#ignite-333: Remove from swap on clearLocally.


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

Branch: refs/heads/ignite-368
Commit: b12945a05feca1c418d5ed76b71f69daaf2cc2a9
Parents: 0875eb7
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Mar 13 14:39:33 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Mar 13 14:39:33 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b12945a0/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 e24f13c..a998c2c 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
@@ -1398,6 +1398,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
             try {
                 if (e != null)
                     e.clear(obsoleteVer, readers, null);
+
+                if (ctx.isSwapOrOffheapEnabled())
+                    entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false,
CU.empty0());
             }
             catch (IgniteCheckedException ex) {
                 U.error(log, "Failed to clearLocally entry (will continue to clearLocally
other entries): " + e,
@@ -1422,7 +1425,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
             GridCacheEntryEx e = peekEx(cacheKey);
 
             if (ctx.isSwapOrOffheapEnabled())
-                ctx.swap().readAndRemove(ctx.toCacheKeyObject(key));
+                entryEx(ctx.toCacheKeyObject(key)).clear(ctx.versions().next(), false, CU.empty0());
 
             return e != null && e.clear(obsoleteVer, false, filter);
         }


Mime
View raw message