ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [17/50] [abbrv] ignite git commit: Merge with master - WIP.
Date Thu, 29 Dec 2016 09:37:21 GMT
Merge with master - WIP.


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

Branch: refs/heads/ignite-3477
Commit: d5e9a3b0fbf0f5b02ddc2bcec588306c64fc52b3
Parents: d068fb7
Author: Ilya Lantukh <ilantukh@gridgain.com>
Authored: Thu Dec 22 15:02:46 2016 +0300
Committer: Ilya Lantukh <ilantukh@gridgain.com>
Committed: Thu Dec 22 15:02:46 2016 +0300

----------------------------------------------------------------------
 .../managers/communication/GridIoMessageFactory.java    | 12 +-----------
 .../dht/atomic/GridNearAtomicSingleUpdateFuture.java    |  1 +
 .../atomic/GridNearAtomicSingleUpdateInvokeRequest.java |  2 ++
 3 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e9a3b0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 4599fd7..81b7312 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -832,17 +832,7 @@ public class GridIoMessageFactory implements MessageFactory {
 
                 break;
 
-            case 125:
-                msg = new TcpCommunicationSpi.HandshakeMessage2();
-
-                break;
-
-            case 126:
-                msg = new IgniteIoTestMessage();
-
-                break;
-
-            // [-3..119] [124-126] - this
+            // [-3..119] [124..127] [-36..-45]- this
             // [120..123] - DR
             // [-4..-22, -30..-35] - SQL
             default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e9a3b0/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 fd2479c..d840c35 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
@@ -585,6 +585,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
                     taskNameHash,
                     skipStore,
                     keepBinary,
+                    recovery,
                     cctx.kernalContext().clientNode(),
                     cctx.deploymentEnabled());
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5e9a3b0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 6582063..02cfd91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -108,6 +108,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
         int taskNameHash,
         boolean skipStore,
         boolean keepBinary,
+        boolean recovery,
         boolean clientReq,
         boolean addDepInfo
     ) {
@@ -126,6 +127,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
             taskNameHash,
             skipStore,
             keepBinary,
+            recovery,
             clientReq,
             addDepInfo
         );


Mime
View raw message