Ignite-67 GG_HEADER
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44c05efa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44c05efa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44c05efa Branch: refs/heads/sprint-1 Commit: 44c05efa731f050d2f6a6af605651f86651c294b Parents: 1719ab5 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:19:02 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:19:02 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/util/GridUtils.java | 2 +- .../internal/util/nio/GridBufferedParser.java | 2 +- .../util/nio/GridConnectionBytesVerifyFilter.java | 18 +++++++++--------- .../communication/tcp/TcpCommunicationSpi.java | 4 ++-- .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../multicast/TcpDiscoveryMulticastIpFinder.java | 14 +++++++------- 7 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java index 18286ef..a89a4ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java @@ -236,7 +236,7 @@ public abstract class GridUtils { indexOf('.', GridUtils.class.getName().indexOf('.') + 1)); /** Network packet header. */ - public static final byte[] GG_HEADER = U.intToBytes(0x00004747); + public static final byte[] IGNITE_HEADER = U.intToBytes(0x00004747); /** Default buffer size = 4K. */ private static final int BUF_SIZE = 4096; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java index b6935b0..3f81dc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridBufferedParser.java @@ -34,7 +34,7 @@ import java.nio.*; * +--+--+--+--+--+--+...+--+--+--+--+--+--+--+...+--+ * </pre> * <p> - * It expects that first 4 bytes in stream are {@link U#GG_HEADER}. If beginning of a stream, + * It expects that first 4 bytes in stream are {@link U#IGNITE_HEADER}. If beginning of a stream, * isn't equal to these bytes than exception will be thrown. */ public class GridBufferedParser implements GridNioParser { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java index 07b5d09..a89da98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java @@ -24,9 +24,9 @@ import java.nio.*; /** * Verifies that first bytes received in accepted (incoming) - * NIO session are equal to {@link U#GG_HEADER}. + * NIO session are equal to {@link U#IGNITE_HEADER}. * <p> - * First {@code U.GG_HEADER.length} bytes are consumed by this filter + * First {@code U.IGNITE_HEADER.length} bytes are consumed by this filter * and all other bytes are forwarded through chain without any modification. */ public class GridConnectionBytesVerifyFilter extends GridNioFilterAdapter { @@ -87,27 +87,27 @@ public class GridConnectionBytesVerifyFilter extends GridNioFilterAdapter { Integer magic = ses.meta(MAGIC_META_KEY); - if (magic == null || magic < U.GG_HEADER.length) { + if (magic == null || magic < U.IGNITE_HEADER.length) { byte[] magicBuf = ses.meta(MAGIC_BUF_KEY); if (magicBuf == null) - magicBuf = new byte[U.GG_HEADER.length]; + magicBuf = new byte[U.IGNITE_HEADER.length]; int magicRead = magic == null ? 0 : magic; int cnt = buf.remaining(); - buf.get(magicBuf, magicRead, Math.min(U.GG_HEADER.length - magicRead, cnt)); + buf.get(magicBuf, magicRead, Math.min(U.IGNITE_HEADER.length - magicRead, cnt)); - if (cnt + magicRead < U.GG_HEADER.length) { + if (cnt + magicRead < U.IGNITE_HEADER.length) { // Magic bytes are not fully read. ses.addMeta(MAGIC_META_KEY, cnt + magicRead); ses.addMeta(MAGIC_BUF_KEY, magicBuf); } - else if (U.bytesEqual(magicBuf, 0, U.GG_HEADER, 0, U.GG_HEADER.length)) { - // Magic bytes read and equal to GG_HEADER. + else if (U.bytesEqual(magicBuf, 0, U.IGNITE_HEADER, 0, U.IGNITE_HEADER.length)) { + // Magic bytes read and equal to IGNITE_HEADER. ses.removeMeta(MAGIC_BUF_KEY); - ses.addMeta(MAGIC_META_KEY, U.GG_HEADER.length); + ses.addMeta(MAGIC_META_KEY, U.IGNITE_HEADER.length); proceedMessageReceived(ses, buf); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 7609df7..c11b3a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -2256,7 +2256,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter else if (log.isDebugEnabled()) log.debug("Received remote node ID: " + rmtNodeId0); - ch.write(ByteBuffer.wrap(U.GG_HEADER)); + ch.write(ByteBuffer.wrap(U.IGNITE_HEADER)); if (recovery != null) { HandshakeMessage msg = new HandshakeMessage(ignite.configuration().getNodeId(), @@ -3016,7 +3016,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } try { - out.write(U.GG_HEADER); + out.write(U.IGNITE_HEADER); out.write(NODE_ID_MSG_TYPE); out.write(nodeIdMsg.nodeIdBytes); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index ac7a6c2..4aed914 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -4606,7 +4606,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov } } - if (!U.bytesEqual(buf, 0, U.GG_HEADER, 0, 4)) { + if (!U.bytesEqual(buf, 0, U.IGNITE_HEADER, 0, 4)) { if (log.isDebugEnabled()) log.debug("Unknown connection detected (is some other software connecting to " + "this GridGain port?) " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index 9196d71..8ba5d46 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -374,7 +374,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov sock.connect(resolved, (int)sockTimeout); - writeToSocket(sock, U.GG_HEADER); + writeToSocket(sock, U.IGNITE_HEADER); return sock; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c05efa/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index 6aea062..bf99a90 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -73,7 +73,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { public static final int DFLT_ADDR_REQ_ATTEMPTS = 2; /** Address request message data. */ - private static final byte[] MSG_ADDR_REQ_DATA = U.GG_HEADER; + private static final byte[] MSG_ADDR_REQ_DATA = U.IGNITE_HEADER; /** */ private static final IgniteMarshaller marsh = new IgniteJdkMarshaller(); @@ -436,7 +436,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { byte[] data = resPckt.getData(); - if (!U.bytesEqual(U.GG_HEADER, 0, data, 0, U.GG_HEADER.length)) { + if (!U.bytesEqual(U.IGNITE_HEADER, 0, data, 0, U.IGNITE_HEADER.length)) { U.error(log, "Failed to verify message header."); continue; @@ -542,12 +542,12 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { this.addrs = addrs; byte[] addrsData = marsh.marshal(addrs); - data = new byte[U.GG_HEADER.length + addrsData.length]; + data = new byte[U.IGNITE_HEADER.length + addrsData.length]; if (data.length > MAX_DATA_LENGTH) throw new IgniteCheckedException("Too long data packet [size=" + data.length + ", max=" + MAX_DATA_LENGTH + "]"); - System.arraycopy(U.GG_HEADER, 0, data, 0, U.GG_HEADER.length); + System.arraycopy(U.IGNITE_HEADER, 0, data, 0, U.IGNITE_HEADER.length); System.arraycopy(addrsData, 0, data, 4, addrsData.length); } @@ -556,11 +556,11 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { * @throws IgniteCheckedException If unmarshalling failed. */ private AddressResponse(byte[] data) throws IgniteCheckedException { - assert U.bytesEqual(U.GG_HEADER, 0, data, 0, U.GG_HEADER.length); + assert U.bytesEqual(U.IGNITE_HEADER, 0, data, 0, U.IGNITE_HEADER.length); this.data = data; - addrs = marsh.unmarshal(Arrays.copyOfRange(data, U.GG_HEADER.length, data.length), null); + addrs = marsh.unmarshal(Arrays.copyOfRange(data, U.IGNITE_HEADER.length, data.length), null); } /** @@ -704,7 +704,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { sock.receive(pckt); - if (!U.bytesEqual(U.GG_HEADER, 0, reqData, 0, U.GG_HEADER.length)) { + if (!U.bytesEqual(U.IGNITE_HEADER, 0, reqData, 0, U.IGNITE_HEADER.length)) { U.error(log, "Failed to verify message header."); continue;
