Merge branch 'ignite-4680-sb' into ignite-4680-sb-1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cc4612e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cc4612e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cc4612e Branch: refs/heads/ignite-4680-sb-1 Commit: 9cc4612e3ec2754f6219048b4a71452575c7e0dc Parents: a58a5db 6187b1f Author: sboikov <[email protected]> Authored: Tue Mar 21 12:19:43 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Mar 21 12:19:43 2017 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 59 +++++++------- .../GridNearAtomicAbstractUpdateRequest.java | 37 +++++---- .../dht/atomic/NearAtomicResponseHelper.java | 82 -------------------- 3 files changed, 48 insertions(+), 130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9cc4612e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 51e40f4,542071a..a118f31 --- 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 @@@ -1911,23 -1921,10 +1908,8 @@@ public class GridDhtAtomicCache<K, V> e GridNearAtomicAbstractUpdateRequest req, int[] stripeIdxs, UpdateReplyClosure completionCb) throws GridCacheEntryRemovedException { - GridNearAtomicUpdateResponse res = new GridNearAtomicUpdateResponse(ctx.cacheId(), - node.id(), - req.futureId(), - req.partition(), - false, - ctx.deploymentEnabled()); - - //List<GridDhtCacheEntry> locked = lockEntries(req, req.topologyVersion(), stripeIdxs); - List<GridDhtCacheEntry> locked = lockEntries(req, req.topologyVersion(), stripeIdxs); -- boolean hasNear = ctx.discovery().cacheNearNode(node, name()); - // Assign next version for update inside entries lock. - //if (ver == null) - - if (hasNear) - res.nearVersion(ver); - if (msgLog.isDebugEnabled()) { msgLog.debug("Assigned update version [futId=" + req.futureId() + ", writeVer=" + ver + ']'); @@@ -1946,7 -1943,8 +1928,7 @@@ node, hasNear, req, - res, + null, - locked, ver, null, ctx.isDrEnabled(), @@@ -1960,11 -1958,21 +1942,19 @@@ if (retVal == null) retVal = new GridCacheReturn(ctx, node.isLocal(), true, null, true); - res.returnValue(retVal); - unlockEntries(locked, null); - + if (TEST_STRIPE_SUBMIT){ + GridNearAtomicUpdateResponse res = new GridNearAtomicUpdateResponse(ctx.cacheId(), + node.id(), + req.futureId(), + req.partition(), + false, + ctx.deploymentEnabled()); + + if (hasNear) + res.nearVersion(ver); - //unlockEntries(locked, null); + res.returnValue(retVal); - if (TEST_STRIPE_SUBMIT){ for (int i = 0; i < req.size(); i++) { fut.addWriteEntry(affinityAssignment, req.key(i),
