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/09/07 11:17:21 UTC
[36/50] [abbrv] ignite git commit: WIP
WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05da69c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05da69c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05da69c7
Branch: refs/heads/ignite-2649
Commit: 05da69c7160f767d57a3b2de09cc50e8faf0b87f
Parents: 8600d92
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 12:50:29 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 12:50:29 2016 +0300
----------------------------------------------------------------------
.../rest/protocols/tcp/MockNioSession.java | 5 ----
.../rest/protocols/tcp/GridTcpRestParser.java | 29 ++++++++------------
.../internal/util/ipc/IpcToNioAdapter.java | 2 +-
.../internal/util/nio/GridNioSession.java | 5 ----
.../internal/util/nio/GridNioSessionImpl.java | 13 +--------
.../util/nio/GridSelectorNioSessionImpl.java | 2 +-
.../nio/impl/GridNioFilterChainSelfTest.java | 5 ----
.../HadoopExternalCommunication.java | 1 -
.../communication/HadoopIpcToNioAdapter.java | 5 ++--
.../communication/HadoopMarshallerFilter.java | 6 ++--
10 files changed, 19 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
index 49fa88d..0129e93 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
@@ -140,9 +140,4 @@ public class MockNioSession extends GridMetadataAwareAdapter implements GridNioS
@Nullable @Override public GridNioRecoveryDescriptor recoveryDescriptor() {
return null;
}
-
- /** {@inheritDoc} */
- @Override public String gridName() {
- return null;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
index e32f0ec..5beff75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -38,7 +38,7 @@ import org.apache.ignite.internal.util.nio.GridNioParser;
import org.apache.ignite.internal.util.nio.GridNioSession;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.MarshallerUtils;
+import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.jetbrains.annotations.Nullable;
@@ -69,7 +69,7 @@ public class GridTcpRestParser implements GridNioParser {
private static final Charset UTF_8 = Charset.forName("UTF-8");
/** JDK marshaller. */
- private final JdkMarshaller jdkMarshaller = new JdkMarshaller();
+ private final Marshaller jdkMarshaller = new JdkMarshaller();
/** Router client flag. */
private final boolean routerClient;
@@ -169,7 +169,7 @@ public class GridTcpRestParser implements GridNioParser {
GridClientMessage msg = (GridClientMessage)msg0;
if (msg instanceof GridMemcachedMessage)
- return encodeMemcache((GridMemcachedMessage)msg, ses.gridName());
+ return encodeMemcache((GridMemcachedMessage)msg);
else if (msg instanceof GridClientPingPacket)
return ByteBuffer.wrap(GridClientPingPacket.PING_PACKET);
else if (msg instanceof GridClientHandshakeRequest) {
@@ -533,12 +533,10 @@ public class GridTcpRestParser implements GridNioParser {
* Encodes memcache message to a raw byte array.
*
* @param msg Message being serialized.
- * @param gridName Grid name.
* @return Serialized message.
* @throws IgniteCheckedException If serialization failed.
*/
- private ByteBuffer encodeMemcache(GridMemcachedMessage msg,
- final String gridName) throws IgniteCheckedException {
+ private ByteBuffer encodeMemcache(GridMemcachedMessage msg) throws IgniteCheckedException {
GridByteArrayList res = new GridByteArrayList(HDR_LEN);
int keyLen = 0;
@@ -548,7 +546,7 @@ public class GridTcpRestParser implements GridNioParser {
if (msg.key() != null) {
ByteArrayOutputStream rawKey = new ByteArrayOutputStream();
- keyFlags = encodeObj(msg.key(), rawKey, gridName);
+ keyFlags = encodeObj(msg.key(), rawKey);
msg.key(rawKey.toByteArray());
@@ -562,7 +560,7 @@ public class GridTcpRestParser implements GridNioParser {
if (msg.value() != null) {
ByteArrayOutputStream rawVal = new ByteArrayOutputStream();
- valFlags = encodeObj(msg.value(), rawVal, gridName);
+ valFlags = encodeObj(msg.value(), rawVal);
msg.value(rawVal.toByteArray());
@@ -647,7 +645,7 @@ public class GridTcpRestParser implements GridNioParser {
byte[] rawKey = (byte[])req.key();
// Only values can be hessian-encoded.
- req.key(decodeObj(keyFlags, rawKey, ses.gridName()));
+ req.key(decodeObj(keyFlags, rawKey));
}
if (req.value() != null) {
@@ -655,7 +653,7 @@ public class GridTcpRestParser implements GridNioParser {
byte[] rawVal = (byte[])req.value();
- req.value(decodeObj(valFlags, rawVal, ses.gridName()));
+ req.value(decodeObj(valFlags, rawVal));
}
}
@@ -713,16 +711,14 @@ public class GridTcpRestParser implements GridNioParser {
*
* @param flags Flags.
* @param bytes Byte array to decode.
- * @param gridName Grid name.
* @return Decoded value.
* @throws IgniteCheckedException If deserialization failed.
*/
- private Object decodeObj(short flags, byte[] bytes,
- final String gridName) throws IgniteCheckedException {
+ private Object decodeObj(short flags, byte[] bytes) throws IgniteCheckedException {
assert bytes != null;
if ((flags & SERIALIZED_FLAG) != 0)
- return MarshallerUtils.unmarshal(gridName, jdkMarshaller, bytes, null);
+ return jdkMarshaller.unmarshal(bytes, null);
int masked = flags & 0xff00;
@@ -753,11 +749,10 @@ public class GridTcpRestParser implements GridNioParser {
*
* @param obj Object to serialize.
* @param out Output stream to which object should be written.
- * @param gridName Grid name.
* @return Serialization flags.
* @throws IgniteCheckedException If JDK serialization failed.
*/
- private int encodeObj(Object obj, ByteArrayOutputStream out, final String gridName) throws IgniteCheckedException {
+ private int encodeObj(Object obj, ByteArrayOutputStream out) throws IgniteCheckedException {
int flags = 0;
byte[] data = null;
@@ -805,7 +800,7 @@ public class GridTcpRestParser implements GridNioParser {
flags |= BYTE_ARR_FLAG;
}
else {
- MarshallerUtils.withNodeName(jdkMarshaller, gridName).marshal(obj, out);
+ jdkMarshaller.marshal(obj, out);
flags |= SERIALIZED_FLAG;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
index 262140a..3e1fef7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
@@ -86,7 +86,7 @@ public class IpcToNioAdapter<T> {
this.writerFactory = writerFactory;
chain = new GridNioFilterChain<>(log, lsnr, new HeadFilter(), filters);
- ses = new GridNioSessionImpl(chain, null, null, true, gridName);
+ ses = new GridNioSessionImpl(chain, null, null, true);
writeBuf = ByteBuffer.allocate(8 << 10);
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
index 74ac775..04463b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSession.java
@@ -165,9 +165,4 @@ public interface GridNioSession {
* @return Recovery descriptor if recovery is supported, {@code null otherwise.}
*/
@Nullable public GridNioRecoveryDescriptor recoveryDescriptor();
-
- /**
- * @return Grid name.
- */
- public String gridName();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
index 100165e..0bcfe64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionImpl.java
@@ -69,28 +69,22 @@ public class GridNioSessionImpl implements GridNioSession {
/** Accepted flag. */
private final boolean accepted;
- /** Grid name. */
- private String gridName;
-
/**
* @param filterChain Chain.
* @param locAddr Local address.
* @param rmtAddr Remote address.
- * @param gridName Grid name.
* @param accepted {@code True} if this session was initiated from remote host.
*/
public GridNioSessionImpl(
GridNioFilterChain filterChain,
@Nullable InetSocketAddress locAddr,
@Nullable InetSocketAddress rmtAddr,
- boolean accepted,
- String gridName
+ boolean accepted
) {
this.filterChain = filterChain;
this.locAddr = locAddr;
this.rmtAddr = rmtAddr;
this.accepted = accepted;
- this.gridName = gridName;
long now = U.currentTimeMillis();
@@ -315,9 +309,4 @@ public class GridNioSessionImpl implements GridNioSession {
@Override public String toString() {
return S.toString(GridNioSessionImpl.class, this);
}
-
- /** {@inheritDoc} */
- @Override public String gridName() {
- return gridName;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 7b2a8f7..5ce1e1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -91,7 +91,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
@Nullable ByteBuffer readBuf,
String gridName
) {
- super(filterChain, locAddr, rmtAddr, accepted, gridName);
+ super(filterChain, locAddr, rmtAddr, accepted);
assert selectorIdx >= 0;
assert sndQueueLimit >= 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/core/src/test/java/org/apache/ignite/internal/util/nio/impl/GridNioFilterChainSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/impl/GridNioFilterChainSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/impl/GridNioFilterChainSelfTest.java
index 61d93c1..201fd27 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/impl/GridNioFilterChainSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/impl/GridNioFilterChainSelfTest.java
@@ -377,10 +377,5 @@ public class GridNioFilterChainSelfTest extends GridCommonAbstractTest {
@Nullable @Override public GridNioRecoveryDescriptor recoveryDescriptor() {
return null;
}
-
- /** {@inheritDoc} */
- @Override public String gridName() {
- return null;
- }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
index 4203069..1d59a95 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
@@ -1179,7 +1179,6 @@ public class HadoopExternalCommunication {
endpoint,
accepted,
srvLsnr,
- gridName,
filters());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopIpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopIpcToNioAdapter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopIpcToNioAdapter.java
index 3d68cbc..a8de999 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopIpcToNioAdapter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopIpcToNioAdapter.java
@@ -62,15 +62,14 @@ public class HadoopIpcToNioAdapter<T> {
* @param log Log.
* @param endp Endpoint.
* @param lsnr Listener.
- * @param gridname Ignite config.
* @param filters Filters.
*/
public HadoopIpcToNioAdapter(IgniteLogger log, IpcEndpoint endp, boolean accepted,
- GridNioServerListener<T> lsnr, String gridname, GridNioFilter... filters) {
+ GridNioServerListener<T> lsnr, GridNioFilter... filters) {
this.endp = endp;
chain = new GridNioFilterChain<>(log, lsnr, new HeadFilter(), filters);
- ses = new GridNioSessionImpl(chain, null, null, accepted, gridname);
+ ses = new GridNioSessionImpl(chain, null, null, accepted);
writeBuf = ByteBuffer.allocate(8 << 10);
http://git-wip-us.apache.org/repos/asf/ignite/blob/05da69c7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
index e71f24d..3f79469 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.util.nio.GridNioFilterAdapter;
import org.apache.ignite.internal.util.nio.GridNioFuture;
import org.apache.ignite.internal.util.nio.GridNioSession;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.MarshallerUtils;
/**
* Serialization filter.
@@ -60,15 +59,14 @@ public class HadoopMarshallerFilter extends GridNioFilterAdapter {
@Override public GridNioFuture<?> onSessionWrite(GridNioSession ses, Object msg) throws IgniteCheckedException {
assert msg instanceof HadoopMessage : "Invalid message type: " + msg;
- return proceedSessionWrite(ses, MarshallerUtils.withNodeName(marshaller, ses.gridName()).marshal(msg));
+ return proceedSessionWrite(ses, marshaller.marshal(msg));
}
- /** {@inheritDoc} */
@Override public void onMessageReceived(GridNioSession ses, Object msg) throws IgniteCheckedException {
assert msg instanceof byte[];
// Always unmarshal with system classloader.
- proceedMessageReceived(ses, MarshallerUtils.unmarshal(ses.gridName(), marshaller, (byte[])msg, null));
+ proceedMessageReceived(ses, marshaller.unmarshal((byte[])msg, null));
}
/** {@inheritDoc} */