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/12/06 10:59:09 UTC

[5/6] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master

Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java


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

Branch: refs/heads/ignite-comm-balance-master
Commit: a35853e7299cd21ca237589097dd92f056425ca6
Parents: 68bac33 79a1600
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 6 13:57:04 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 6 13:57:04 2016 +0300

----------------------------------------------------------------------
 .../communication/GridIoMessageFactory.java     |  28 ++-
 .../internal/processors/hadoop/HadoopJobId.java |   2 +-
 .../hadoop/shuffle/HadoopShuffleAck.java        |   2 +-
 .../shuffle/HadoopShuffleFinishRequest.java     | 172 ++++++++++++++
 .../shuffle/HadoopShuffleFinishResponse.java    | 142 ++++++++++++
 .../hadoop/shuffle/HadoopShuffleMessage.java    |   2 +-
 .../hadoop/shuffle/HadoopShuffle.java           |  45 ++--
 .../hadoop/shuffle/HadoopShuffleJob.java        | 231 +++++++++++++++++--
 .../hadoop/shuffle/HadoopShuffleLocalState.java |  67 ++++++
 .../shuffle/HadoopShuffleRemoteState.java       |  64 +++++
 .../child/HadoopChildProcessRunner.java         |   6 +-
 11 files changed, 697 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a35853e7/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 14f7e7c,4ffb220..cd506b7
--- 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
@@@ -793,21 -810,6 +810,16 @@@ public class GridIoMessageFactory imple
  
                  break;
  
-             case -36:
-                 msg = new GridDhtAtomicSingleUpdateRequest();
- 
-                 break;
- 
 +            case -37:
 +                msg = new TcpCommunicationSpi.HandshakeMessage2();
 +
 +                break;
 +
 +            case -38:
 +                msg = new IgniteIoTestMessage();
 +
 +                break;
 +
              // [-3..119] [124..127] [-36]- this
              // [120..123] - DR
              // [-4..-22, -30..-35] - SQL