IGNITE-61 - Direct marshalling

apache · Feb 9, 2015 · 1c19aa4 · 1c19aa4
1 parent f62ee2d
commit 1c19aa4
Show file tree

Hide file tree

Showing 23 changed files with 620 additions and 591 deletions.
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,6 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.direct.*;
 import org.apache.ignite.plugin.*;
 import org.apache.ignite.spi.*;
 
@@ -93,9 +92,4 @@ public GridPluginContext(GridKernalContext ctx, PluginConfiguration cfg, IgniteC
     @Override public void deregisterPorts(Class<?> cls) {
         ctx.ports().deregisterPorts(cls);
     }
-
-    /** {@inheritDoc} */
-    @Override public byte registerMessageProducer(GridTcpCommunicationMessageProducer producer) {
-        return ctx.io().registerMessageProducer(producer);
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -768,8 +768,6 @@ public void start(final IgniteConfiguration cfg, ExecutorService utilityCachePoo
                 provider.start(ctx.plugins().pluginContextForProvider(provider), attrs);
             }
 
-            ctx.io().initMessageFactory();
-
             if (ctx.isEnterprise()) {
                 security = new GridSecurityImpl(ctx);
                 portables = new GridPortablesImpl(ctx);

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
@@ -259,7 +259,7 @@ private static Type type(Class<?> cls) {
     }
 
     /** */
-    private final GridTcpMessageFactory msgFactory;
+    private final MessageFactory msgFactory;
 
     /** */
     private ByteBuffer buf;
@@ -318,7 +318,7 @@ private static Type type(Class<?> cls) {
     /**
      * @param msgFactory Message factory.
      */
-    public DirectByteBufferStream(@Nullable GridTcpMessageFactory msgFactory) {
+    public DirectByteBufferStream(@Nullable MessageFactory msgFactory) {
         this.msgFactory = msgFactory;
     }
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -37,7 +37,7 @@ public class DirectMessageReader implements MessageReader {
     /**
      * @param msgFactory Message factory.
      */
-    public DirectMessageReader(GridTcpMessageFactory msgFactory) {
+    public DirectMessageReader(MessageFactory msgFactory) {
         this.stream = new DirectByteBufferStream(msgFactory);
     }