Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2A016200BE3 for ; Thu, 22 Dec 2016 16:15:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 28990160B27; Thu, 22 Dec 2016 15:15:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0726C160B4D for ; Thu, 22 Dec 2016 16:15:42 +0100 (CET) Received: (qmail 59660 invoked by uid 500); 22 Dec 2016 15:15:42 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 58963 invoked by uid 99); 22 Dec 2016 15:15:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2016 15:15:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8D28DFCF4; Thu, 22 Dec 2016 15:15:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 22 Dec 2016 15:16:02 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] ignite git commit: IGNITE-4271: Hadoop: set proper message type IDs to avoid clashing with SQL messages. archived-at: Thu, 22 Dec 2016 15:15:44 -0000 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/e857f297 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e857f297 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e857f297 Branch: refs/heads/master Commit: e857f297bb22bde984b5e99c1fc62a389fa54f9b Parents: be12a7e Author: devozerov Authored: Tue Dec 6 13:12:23 2016 +0300 Committer: devozerov Committed: Thu Dec 15 13:46:06 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/e857f297/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/e857f297/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/e857f297/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/e857f297/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} */