Repository: incubator-ignite Updated Branches: refs/heads/ignite-9655-merge 79d5d325d -> 6699188fe
IGNITE-9655-Merge - Fixed data structures near update. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6699188f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6699188f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6699188f Branch: refs/heads/ignite-9655-merge Commit: 6699188fe3c0a4fe6e64f908706dd313150f111a Parents: 79d5d32 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Feb 13 19:55:22 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Feb 13 19:55:22 2015 -0800 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 2 +- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6699188f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index 356ef4c..1562b9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -368,7 +368,7 @@ public class GridDhtCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { } // If remote node has no near cache, don't add it. - if (!U.hasNearCache(node, cacheName()) && !(key instanceof GridCacheInternal)) { + if (!U.hasNearCache(node, cacheName())) { if (log.isDebugEnabled()) log.debug("Ignoring near reader because near cache is disabled: " + nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6699188f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index e30cb40..7c4b506 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -819,9 +819,6 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu } tx.needsCompletedVersions(hasRemoteNodes); - - tx.addDhtMapping(futDhtMap); - tx.addNearMapping(futNearMap); } if (isDone()) @@ -847,7 +844,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu if (F.isEmpty(dhtWrites) && F.isEmpty(nearWrites)) continue; - MiniFuture fut = new MiniFuture(n.id(), dhtMap.get(n.id()), nearMap.get(n.id())); + MiniFuture fut = new MiniFuture(n.id(), dhtMapping, nearMapping); add(fut); // Append new future.
