You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/12/06 10:12:57 UTC
[1/2] ignite git commit: IGNITE-4271: Hadoop: set proper message type
IDs to avoid clashing with SQL messages.
Repository: ignite
Updated Branches:
refs/heads/master 4e1fc4065 -> 2582c5caf
IGNITE-4271: Hadoop: set proper message type IDs to avoid clashing with SQL messages.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14c68dad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14c68dad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14c68dad
Branch: refs/heads/master
Commit: 14c68dadbaa4558fb2bde3823bb45d32919897ce
Parents: 9e9e371
Author: devozerov <vo...@gridgain.com>
Authored: Tue Dec 6 13:12:23 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Dec 6 13:12:23 2016 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 16 ++++++++--------
.../internal/processors/hadoop/HadoopJobId.java | 2 +-
.../processors/hadoop/shuffle/HadoopShuffleAck.java | 2 +-
.../hadoop/shuffle/HadoopShuffleMessage.java | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/14c68dad/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 dd68984..86742e8 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
@@ -168,21 +168,26 @@ public class GridIoMessageFactory implements MessageFactory {
Message msg = null;
switch (type) {
- case -30:
+ case -39:
msg = new HadoopJobId();
break;
- case -29:
+ case -38:
msg = new HadoopShuffleAck();
break;
- case -28:
+ case -37:
msg = new HadoopShuffleMessage();
break;
+ case -36:
+ msg = new GridDhtAtomicSingleUpdateRequest();
+
+ break;
+
case -27:
msg = new GridDhtTxOnePhaseCommitAckRequest();
@@ -793,11 +798,6 @@ public class GridIoMessageFactory implements MessageFactory {
break;
- case -36:
- msg = new GridDhtAtomicSingleUpdateRequest();
-
- break;
-
// [-3..119] [124..127] [-36]- this
// [120..123] - DR
// [-4..-22, -30..-35] - SQL
http://git-wip-us.apache.org/repos/asf/ignite/blob/14c68dad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
index 740ab89..761b904 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
@@ -126,7 +126,7 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
/** {@inheritDoc} */
@Override public byte directType() {
- return -30;
+ return -39;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/14c68dad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
index 6dd2c2d..9a03f99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
@@ -136,7 +136,7 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
/** {@inheritDoc} */
@Override public byte directType() {
- return -29;
+ return -38;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/14c68dad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
index 3732bc2..af54dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
@@ -302,7 +302,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
/** {@inheritDoc} */
@Override public byte directType() {
- return -28;
+ return -37;
}
/** {@inheritDoc} */
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2582c5ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2582c5ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2582c5ca
Branch: refs/heads/master
Commit: 2582c5caf021c0b597eea2e40f750792d28acc70
Parents: 14c68da 4e1fc40
Author: devozerov <vo...@gridgain.com>
Authored: Tue Dec 6 13:12:48 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Dec 6 13:12:48 2016 +0300
----------------------------------------------------------------------
.../Process/IgniteProcess.cs | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------