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 2016/02/16 11:01:49 UTC
[6/6] ignite git commit: ignite-2466
ignite-2466
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d76e710f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d76e710f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d76e710f
Branch: refs/heads/ignite-2466
Commit: d76e710f39024631383452ac6074c52c446545a8
Parents: de6f1af
Author: sboikov <sb...@gridgain.com>
Authored: Tue Feb 16 13:01:35 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Feb 16 13:01:35 2016 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 4 ++--
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 5 +++--
.../dht/atomic/GridNearAtomicUpdateRequest.java | 11 ++++++++++-
3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d76e710f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index e654885..e908c05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1460,7 +1460,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
res.returnValue(retVal);
if (req.writeSynchronizationMode() != FULL_ASYNC)
- req.cleanup();
+ req.cleanup(!node.isLocal());
if (dhtFut != null)
ctx.mvcc().addAtomicFuture(dhtFut.version(), dhtFut);
@@ -1518,7 +1518,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (remap) {
assert dhtFut == null;
- res.remapKeys(req.keys());
+ res.remapKeys(keys);
completionCb.apply(req, res);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d76e710f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index e417cdb..86edadb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -1071,8 +1071,9 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid
// Do not keep values if they are not needed for continuous query notification.
if (locPrevVals == null) {
- vals = null;
- locPrevVals = null;
+ keys = null;
+ vals = null;
+ locPrevVals = null;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d76e710f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 9abf385..0f97e59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -1026,9 +1026,18 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri
/**
* Cleanup values.
+ *
+ * @param clearKeys If {@code true} clears keys.
*/
- public void cleanup() {
+ public void cleanup(boolean clearKeys) {
vals = null;
+ entryProcessors = null;
+ entryProcessorsBytes = null;
+ invokeArgs = null;
+ invokeArgsBytes = null;
+
+ if (clearKeys)
+ keys = null;
}
/** {@inheritDoc} */