IGNITE-61 - Direct marshalling

apache · Feb 7, 2015 · 415902e · 415902e
1 parent 0864344
commit 415902e
Show file tree

Hide file tree

Showing 155 changed files with 1,748 additions and 1,145 deletions.
diff --git a/...s/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/...s/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -31,9 +31,9 @@
 import org.apache.ignite.internal.processors.cache.distributed.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.communication.tcp.*;
@@ -761,7 +761,7 @@ private static class TestTask extends ComputeTaskSplitAdapter<Object, String> {
     @SuppressWarnings("unchecked")
     private static class TestCommunicationSpi extends TcpCommunicationSpi {
         /** {@inheritDoc} */
-        @Override public void sendMessage(ClusterNode node, GridTcpCommunicationMessageAdapter msg)
+        @Override public void sendMessage(ClusterNode node, MessageAdapter msg)
             throws IgniteSpiException {
             checkSyncFlags((GridIoMessage)msg);
 

diff --git a/...es/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/...es/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -15,9 +15,9 @@
 import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -63,7 +63,7 @@ public class CommunicationMessageCodeGenerator {
     private static final String SRC_DIR = U.getIgniteHome() + "/modules/core/src/main/java";
 
     /** */
-    private static final Class<?> BASE_CLS = GridTcpCommunicationMessageAdapter.class;
+    private static final Class<?> BASE_CLS = MessageAdapter.class;
 
     /** */
     private static final String EMPTY = "";
@@ -143,9 +143,9 @@ public static void main(String[] args) {
      * @throws Exception In case of error.
      */
     public void generateAll(boolean write) throws Exception {
-        Collection<Class<? extends GridTcpCommunicationMessageAdapter>> classes = classes();
+        Collection<Class<? extends MessageAdapter>> classes = classes();
 
-        for (Class<? extends GridTcpCommunicationMessageAdapter> cls : classes) {
+        for (Class<? extends MessageAdapter> cls : classes) {
             boolean isAbstract = Modifier.isAbstract(cls.getModifiers());
 
             System.out.println("Processing class: " + cls.getName() + (isAbstract ? " (abstract)" : ""));
@@ -158,7 +158,7 @@ public void generateAll(boolean write) throws Exception {
 
 //        type = 0;
 //
-//        for (Class<? extends GridTcpCommunicationMessageAdapter> cls : classes) {
+//        for (Class<? extends MessageAdapter> cls : classes) {
 //            if (Modifier.isAbstract(cls.getModifiers()))
 //                continue;
 //
@@ -177,7 +177,7 @@ public void generateAll(boolean write) throws Exception {
      * @throws Exception In case of error.
      */
     @SuppressWarnings("ConstantConditions")
-    private void generateAndWrite(Class<? extends GridTcpCommunicationMessageAdapter> cls) throws Exception {
+    private void generateAndWrite(Class<? extends MessageAdapter> cls) throws Exception {
         assert cls != null;
 
         generate(cls);
@@ -228,14 +228,14 @@ else if (line.contains("public boolean readFrom(ByteBuffer buf)")) {
 //
 //                        skip = true;
 //                    }
-                    else if (line.contains("public GridTcpCommunicationMessageAdapter clone()")) {
+                    else if (line.contains("public MessageAdapter clone()")) {
                         src.addAll(clone);
 
                         skip = true;
 
                         cloneFound = true;
                     }
-                    else if (line.contains("protected void clone0(GridTcpCommunicationMessageAdapter _msg)")) {
+                    else if (line.contains("protected void clone0(MessageAdapter _msg)")) {
                         src.addAll(clone0);
 
                         skip = true;
@@ -287,7 +287,7 @@ else if (line.startsWith(TAB + "}")) {
      * @param cls Class.
      * @throws Exception In case of error.
      */
-    public void generate(Class<? extends GridTcpCommunicationMessageAdapter> cls) throws Exception {
+    public void generate(Class<? extends MessageAdapter> cls) throws Exception {
         assert cls != null;
 
         write.clear();
@@ -1065,11 +1065,11 @@ private SB builder() {
      * @return Classes.
      * @throws Exception In case of error.
      */
-    private Collection<Class<? extends GridTcpCommunicationMessageAdapter>> classes() throws Exception {
-        Collection<Class<? extends GridTcpCommunicationMessageAdapter>> col = new TreeSet<>(
-            new Comparator<Class<? extends GridTcpCommunicationMessageAdapter>>() {
-                @Override public int compare(Class<? extends GridTcpCommunicationMessageAdapter> c1,
-                    Class<? extends GridTcpCommunicationMessageAdapter> c2) {
+    private Collection<Class<? extends MessageAdapter>> classes() throws Exception {
+        Collection<Class<? extends MessageAdapter>> col = new TreeSet<>(
+            new Comparator<Class<? extends MessageAdapter>>() {
+                @Override public int compare(Class<? extends MessageAdapter> c1,
+                    Class<? extends MessageAdapter> c2) {
                     return c1.getName().compareTo(c2.getName());
                 }
             });
@@ -1097,7 +1097,7 @@ private Collection<Class<? extends GridTcpCommunicationMessageAdapter>> classes(
      * @throws Exception In case of error.
      */
     private void processFile(File file, ClassLoader ldr, int prefixLen,
-        Collection<Class<? extends GridTcpCommunicationMessageAdapter>> col) throws Exception {
+        Collection<Class<? extends MessageAdapter>> col) throws Exception {
         assert file != null;
         assert ldr != null;
         assert prefixLen > 0;
@@ -1122,7 +1122,7 @@ private void processFile(File file, ClassLoader ldr, int prefixLen,
 
                 if (cls.getDeclaringClass() == null && cls.getEnclosingClass() == null &&
                     !BASE_CLS.equals(cls) && BASE_CLS.isAssignableFrom(cls))
-                    col.add((Class<? extends GridTcpCommunicationMessageAdapter>)cls);
+                    col.add((Class<? extends MessageAdapter>)cls);
             }
         }
     }

diff --git a/...ain/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java b/...ain/java/org/apache/ignite/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -18,18 +18,18 @@
 package org.apache.ignite.client.impl.connection;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.direct.*;
 import org.apache.ignite.logger.java.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.client.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.client.util.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.nio.ssl.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
-import org.gridgain.grid.util.direct.*;
 import org.jetbrains.annotations.*;
 
 import javax.net.ssl.*;
@@ -666,15 +666,15 @@ private static class NioParser implements GridNioParser {
                 return new GridClientHandshakeResponse(code);
             }
 
-            GridTcpCommunicationMessageAdapter msg = ses.removeMeta(MSG_META_KEY);
+            MessageAdapter msg = ses.removeMeta(MSG_META_KEY);
 
             if (msg == null && buf.hasRemaining()) {
                 byte type = buf.get();
 
                 if (type == GridClientMessageWrapper.REQ_HEADER) {
                     msg = new GridClientMessageWrapper();
 
-                    msg.setReader(new GridTcpCommunicationMessageReader(null));
+                    msg.setReader(new DirectMessageReader(null));
                 }
                 else
                     throw new IOException("Invalid message type: " + type);

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -28,7 +28,7 @@
 /**
  * Job cancellation request.
  */
-public class GridJobCancelRequest extends GridTcpCommunicationMessageAdapter {
+public class GridJobCancelRequest extends MessageAdapter {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -111,7 +111,7 @@ public boolean system() {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public GridTcpCommunicationMessageAdapter clone() {
+    @Override public MessageAdapter clone() {
         GridJobCancelRequest _clone = new GridJobCancelRequest();
 
         clone0(_clone);
@@ -120,7 +120,7 @@ public boolean system() {
     }
 
     /** {@inheritDoc} */
-    @Override protected void clone0(GridTcpCommunicationMessageAdapter _msg) {
+    @Override protected void clone0(MessageAdapter _msg) {
         GridJobCancelRequest _clone = (GridJobCancelRequest)_msg;
 
         _clone.sesId = sesId;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -19,10 +19,10 @@
 
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -32,7 +32,7 @@
 /**
  * Job execution request.
  */
-public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter implements GridTaskMessage {
+public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMessage {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -413,7 +413,7 @@ public UUID getSubjectId() {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public GridTcpCommunicationMessageAdapter clone() {
+    @Override public MessageAdapter clone() {
         GridJobExecuteRequest _clone = new GridJobExecuteRequest();
 
         clone0(_clone);
@@ -422,7 +422,7 @@ public UUID getSubjectId() {
     }
 
     /** {@inheritDoc} */
-    @Override protected void clone0(GridTcpCommunicationMessageAdapter _msg) {
+    @Override protected void clone0(MessageAdapter _msg) {
         GridJobExecuteRequest _clone = (GridJobExecuteRequest)_msg;
 
         _clone.subjId = subjId;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -31,7 +31,7 @@
 /**
  * Job execution response.
  */
-public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter implements GridTaskMessage {
+public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMessage {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -206,7 +206,7 @@ public void setFakeException(IgniteException fakeEx) {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public GridTcpCommunicationMessageAdapter clone() {
+    @Override public MessageAdapter clone() {
         GridJobExecuteResponse _clone = new GridJobExecuteResponse();
 
         clone0(_clone);
@@ -215,7 +215,7 @@ public void setFakeException(IgniteException fakeEx) {
     }
 
     /** {@inheritDoc} */
-    @Override protected void clone0(GridTcpCommunicationMessageAdapter _msg) {
+    @Override protected void clone0(MessageAdapter _msg) {
         GridJobExecuteResponse _clone = (GridJobExecuteResponse)_msg;
 
         _clone.nodeId = nodeId;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.internal;
 
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 
 import java.io.*;
 import java.nio.*;
 
 /**
  * Job siblings request.
  */
-public class GridJobSiblingsRequest extends GridTcpCommunicationMessageAdapter {
+public class GridJobSiblingsRequest extends MessageAdapter {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -85,7 +85,7 @@ public byte[] topicBytes() {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public GridTcpCommunicationMessageAdapter clone() {
+    @Override public MessageAdapter clone() {
         GridJobSiblingsRequest _clone = new GridJobSiblingsRequest();
 
         clone0(_clone);
@@ -94,7 +94,7 @@ public byte[] topicBytes() {
     }
 
     /** {@inheritDoc} */
-    @Override protected void clone0(GridTcpCommunicationMessageAdapter _msg) {
+    @Override protected void clone0(MessageAdapter _msg) {
         GridJobSiblingsRequest _clone = (GridJobSiblingsRequest)_msg;
 
         _clone.sesId = sesId;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -19,9 +19,9 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
-import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.plugin.extensions.communication.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -31,7 +31,7 @@
 /**
  * Job siblings response.
  */
-public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter {
+public class GridJobSiblingsResponse extends MessageAdapter {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -78,7 +78,7 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public GridTcpCommunicationMessageAdapter clone() {
+    @Override public MessageAdapter clone() {
         GridJobSiblingsResponse _clone = new GridJobSiblingsResponse();
 
         clone0(_clone);
@@ -87,7 +87,7 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
     }
 
     /** {@inheritDoc} */
-    @Override protected void clone0(GridTcpCommunicationMessageAdapter _msg) {
+    @Override protected void clone0(MessageAdapter _msg) {
         GridJobSiblingsResponse _clone = (GridJobSiblingsResponse)_msg;
 
         _clone.siblings = siblings;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginContext.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.direct.*;
+import org.apache.ignite.internal.direct.*;
 import org.apache.ignite.plugin.*;
 import org.apache.ignite.spi.*;