ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] ignite git commit: ignite-4705
Date Thu, 02 Mar 2017 08:23:00 GMT
ignite-4705


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

Branch: refs/heads/ignite-4705-1
Commit: 5215ed4ca9e95a8afc9c5829f4d3b73d028368c6
Parents: 68eae79
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Mar 2 11:22:51 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Mar 2 11:22:51 2017 +0300

----------------------------------------------------------------------
 .../GridNearAtomicSingleUpdateFuture.java       | 40 +++++-----
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 82 ++++++++++----------
 2 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5215ed4c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index b1b951f..6152faf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -203,26 +203,26 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
 
     /** {@inheritDoc} */
     @Override public void onMappingReceived(UUID nodeId, GridNearAtomicMappingResponse res)
{
-        GridCacheReturn opRes0;
-        CachePartialUpdateCheckedException err0;
-        AffinityTopologyVersion remapTopVer0;
-
-        synchronized (mux) {
-            if (futId == null || futId != res.futureId())
-                return;
-
-            assert reqState != null;
-
-            if (reqState.onMappingReceived(cctx, res)) {
-                opRes0 = opRes;
-                err0 = err;
-                remapTopVer0 = onAllReceived();
-            }
-            else
-                return;
-        }
-
-        finishUpdateFuture(opRes0, err0, remapTopVer0);
+//        GridCacheReturn opRes0;
+//        CachePartialUpdateCheckedException err0;
+//        AffinityTopologyVersion remapTopVer0;
+//
+//        synchronized (mux) {
+//            if (futId == null || futId != res.futureId())
+//                return;
+//
+//            assert reqState != null;
+//
+//            if (reqState.onMappingReceived(cctx, res)) {
+//                opRes0 = opRes;
+//                err0 = err;
+//                remapTopVer0 = onAllReceived();
+//            }
+//            else
+//                return;
+//        }
+//
+//        finishUpdateFuture(opRes0, err0, remapTopVer0);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/5215ed4c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 573cb40..44d3238 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -285,47 +285,47 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
 
     /** {@inheritDoc} */
     @Override public void onMappingReceived(UUID nodeId, GridNearAtomicMappingResponse res)
{
-        GridCacheReturn opRes0;
-        CachePartialUpdateCheckedException err0;
-        AffinityTopologyVersion remapTopVer0;
-
-        synchronized (mux) {
-            if (futId == null || futId != res.futureId())
-                return;
-
-            PrimaryRequestState reqState;
-
-            if (singleReq != null) {
-                if (singleReq.onMappingReceived(cctx, res)) {
-                    opRes0 = opRes;
-                    err0 = err;
-                    remapTopVer0 = onAllReceived();
-                }
-                else
-                    return;
-            }
-            else {
-                reqState = mappings != null ? mappings.get(nodeId) : null;
-
-                if (reqState != null && reqState.onMappingReceived(cctx, res)) {
-                    assert mappings.size() > resCnt : "[mappings=" + mappings.size() +
", cnt=" + resCnt + ']';
-
-                    resCnt++;
-
-                    if (mappings.size() == resCnt) {
-                        opRes0 = opRes;
-                        err0 = err;
-                        remapTopVer0 = onAllReceived();
-                    }
-                    else
-                        return;
-                }
-                else
-                    return;
-            }
-        }
-
-        finishUpdateFuture(opRes0, err0, remapTopVer0);
+//        GridCacheReturn opRes0;
+//        CachePartialUpdateCheckedException err0;
+//        AffinityTopologyVersion remapTopVer0;
+//
+//        synchronized (mux) {
+//            if (futId == null || futId != res.futureId())
+//                return;
+//
+//            PrimaryRequestState reqState;
+//
+//            if (singleReq != null) {
+//                if (singleReq.onMappingReceived(cctx, res)) {
+//                    opRes0 = opRes;
+//                    err0 = err;
+//                    remapTopVer0 = onAllReceived();
+//                }
+//                else
+//                    return;
+//            }
+//            else {
+//                reqState = mappings != null ? mappings.get(nodeId) : null;
+//
+//                if (reqState != null && reqState.onMappingReceived(cctx, res))
{
+//                    assert mappings.size() > resCnt : "[mappings=" + mappings.size()
+ ", cnt=" + resCnt + ']';
+//
+//                    resCnt++;
+//
+//                    if (mappings.size() == resCnt) {
+//                        opRes0 = opRes;
+//                        err0 = err;
+//                        remapTopVer0 = onAllReceived();
+//                    }
+//                    else
+//                        return;
+//                }
+//                else
+//                    return;
+//            }
+//        }
+//
+//        finishUpdateFuture(opRes0, err0, remapTopVer0);
     }
 
     /** {@inheritDoc} */


Mime
View raw message