ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/3] ignite git commit: WIP.
Date Mon, 31 Aug 2015 08:21:29 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1331 [created] 8d4fbc57d


WIP.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6fceac02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6fceac02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6fceac02

Branch: refs/heads/ignite-1331
Commit: 6fceac029c675f7d2a5f0634859d480a3babedce
Parents: e6de574
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Aug 31 10:58:37 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Aug 31 10:58:37 2015 +0300

----------------------------------------------------------------------
 .../platform/PlatformNoopProcessor.java         |  5 ++
 .../processors/platform/PlatformProcessor.java  |  7 +++
 .../processors/platform/PlatformTarget.java     | 24 +++----
 .../platform/PlatformAbstractTarget.java        | 66 ++++++++++++++------
 .../platform/cache/PlatformCache.java           |  8 +--
 .../cache/affinity/PlatformAffinity.java        |  8 +--
 .../platform/cluster/PlatformClusterGroup.java  |  8 +--
 .../platform/compute/PlatformCompute.java       |  7 ++-
 .../datastreamer/PlatformDataStreamer.java      |  2 +-
 .../platform/events/PlatformEvents.java         |  6 +-
 .../platform/messaging/PlatformMessaging.java   |  6 +-
 .../platform/services/PlatformServices.java     | 10 +--
 12 files changed, 99 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
index e60fbeb..7cb65d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
@@ -48,4 +48,9 @@ public class PlatformNoopProcessor extends GridProcessorAdapter implements
Platf
     @Override public void awaitStart() throws IgniteCheckedException {
         // No-op.
     }
+
+    /** {@inheritDoc} */
+    @Override public PlatformTarget extensions() {
+        return null;
+    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
index 8c48649..0cf2df4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
@@ -51,4 +51,11 @@ public interface PlatformProcessor extends GridProcessor {
      * @throws IgniteCheckedException If failed.
      */
     public void awaitStart() throws IgniteCheckedException;
+
+    /**
+     * Get platform extensions. Override this method to provide any additional targets and
operations you need.
+     *
+     * @return Platform extensions.
+     */
+    PlatformTarget extensions();
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
index b444247..e8b5b66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
@@ -26,24 +26,24 @@ import org.jetbrains.annotations.*;
 @SuppressWarnings("UnusedDeclaration")
 public interface PlatformTarget {
     /**
-     * Synchronous IN operation.
+     * Operation accepting memory stream and returning long value.
      *
      * @param type Operation type.
      * @param memPtr Memory pointer.
-     * @return Value specific for the given operation otherwise.
-     * @throws Exception If failed.
+     * @return Result.
+     * @throws Exception If case of failure.
      */
-    public int inOp(int type, long memPtr) throws Exception;
+    public int inStreamOutLong(int type, long memPtr) throws Exception;
 
     /**
-     * Synchronous IN operation which returns managed object as result.
+     * Operation accepting memory stream and returning object.
      *
      * @param type Operation type.
      * @param memPtr Memory pointer.
-     * @return Managed result.
+     * @return Result.
      * @throws Exception If case of failure.
      */
-    public Object inOpObject(int type, long memPtr) throws Exception;
+    public Object inStreamOutObject(int type, long memPtr) throws Exception;
 
     /**
      * Synchronous OUT operation.
@@ -55,25 +55,25 @@ public interface PlatformTarget {
     public void outOp(int type, long memPtr) throws Exception;
 
     /**
-     * Synchronous IN-OUT operation.
+     * Operation accepting one memory stream and returning result to another memory stream.
      *
      * @param type Operation type.
      * @param inMemPtr Input memory pointer.
      * @param outMemPtr Output memory pointer.
      * @throws Exception In case of failure.
      */
-    public void inOutOp(int type, long inMemPtr, long outMemPtr) throws Exception;
+    public void inStreamOutStream(int type, long inMemPtr, long outMemPtr) throws Exception;
 
     /**
-     * Synchronous IN-OUT operation with optional argument.
+     * Operation accepting an object and a memory stream and returning result to another
memory stream.
      *
      * @param type Operation type.
+     * @param arg Argument (optional).
      * @param inMemPtr Input memory pointer.
      * @param outMemPtr Output memory pointer.
-     * @param arg Argument (optional).
      * @throws Exception In case of failure.
      */
-    public void inOutOp(int type, long inMemPtr, long outMemPtr, @Nullable Object arg) throws
Exception;
+    public void inObjectStreamOutStream(int type, @Nullable Object arg, long inMemPtr, long
outMemPtr) throws Exception;
 
     /**
      * Start listening for the future.

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
index 903df0a..23add19 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
@@ -55,7 +55,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
     }
 
     /** {@inheritDoc} */
-    @Override public int inOp(int type, long memPtr) throws Exception {
+    @Override public int inStreamOutLong(int type, long memPtr) throws Exception {
         try (PlatformMemory mem = platformCtx.memory().get(memPtr)) {
             PortableRawReaderEx reader = platformCtx.reader(mem);
 
@@ -65,7 +65,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
                 return TRUE;
             }
             else
-                return processInOp(type, reader);
+                return processInStreamOutLong(type, reader);
         }
         catch (Exception e) {
             throw convertException(e);
@@ -73,11 +73,11 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
     }
 
     /** {@inheritDoc} */
-    @Override public Object inOpObject(int type, long memPtr) throws Exception {
+    @Override public Object inStreamOutObject(int type, long memPtr) throws Exception {
         try (PlatformMemory mem = platformCtx.memory().get(memPtr)) {
             PortableRawReaderEx reader = platformCtx.reader(mem);
 
-            return processInOpObject(type, reader);
+            return processInStreamOutObject(type, reader);
         }
         catch (Exception e) {
             throw convertException(e);
@@ -101,12 +101,27 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
     }
 
     /** {@inheritDoc} */
-    @Override public void inOutOp(int type, long inMemPtr, long outMemPtr) throws Exception
{
-        inOutOp(type, inMemPtr, outMemPtr, null);
+    @Override public void inStreamOutStream(int type, long inMemPtr, long outMemPtr) throws
Exception {
+        try (PlatformMemory inMem = platformCtx.memory().get(inMemPtr)) {
+            PortableRawReaderEx reader = platformCtx.reader(inMem);
+
+            try (PlatformMemory outMem = platformCtx.memory().get(outMemPtr)) {
+                PlatformOutputStream out = outMem.output();
+
+                PortableRawWriterEx writer = platformCtx.writer(out);
+
+                processInStreamOutStream(type, reader, writer);
+
+                out.synchronize();
+            }
+        }
+        catch (Exception e) {
+            throw convertException(e);
+        }
     }
 
     /** {@inheritDoc} */
-    @Override public void inOutOp(int type, long inMemPtr, long outMemPtr, Object arg) throws
Exception {
+    @Override public void inObjectStreamOutStream(int type, Object arg, long inMemPtr, long
outMemPtr) throws Exception {
         try (PlatformMemory inMem = platformCtx.memory().get(inMemPtr)) {
             PortableRawReaderEx reader = platformCtx.reader(inMem);
 
@@ -115,7 +130,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
 
                 PortableRawWriterEx writer = platformCtx.writer(out);
 
-                processInOutOp(type, reader, writer, arg);
+                processInObjectStreamOutStream(type, arg, reader, writer);
 
                 out.synchronize();
             }
@@ -156,7 +171,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      * Get current future with proper exception conversions.
      *
      * @return Future.
-     * @throws org.apache.ignite.IgniteCheckedException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings({"ThrowableResultOfMethodCallIgnored", "unchecked"})
     protected IgniteFuture currentFutureWrapped() throws IgniteCheckedException {
@@ -185,7 +200,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      * When overridden in a derived class, gets future for the current operation.
      *
      * @return current future.
-     * @throws org.apache.ignite.IgniteCheckedException
+     * @throws IgniteCheckedException
      */
     protected IgniteFuture currentFuture() throws IgniteCheckedException {
         throw new IgniteCheckedException("Future listening is not supported in " + this.getClass());
@@ -207,9 +222,9 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      * @param type Type.
      * @param reader Portable reader.
      * @return Result.
-     * @throws org.apache.ignite.IgniteCheckedException In case of exception.
+     * @throws IgniteCheckedException In case of exception.
      */
-    protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    protected int processInStreamOutLong(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
         return throwUnsupported(type);
     }
 
@@ -219,9 +234,9 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      * @param type Type.
      * @param reader Portable reader.
      * @return Result.
-     * @throws org.apache.ignite.IgniteCheckedException In case of exception.
+     * @throws IgniteCheckedException In case of exception.
      */
-    protected Object processInOpObject(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    protected Object processInStreamOutObject(int type, PortableRawReaderEx reader) throws
IgniteCheckedException {
         return throwUnsupported(type);
     }
 
@@ -230,7 +245,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      *
      * @param type Type.
      * @param writer Portable writer.
-     * @throws org.apache.ignite.IgniteCheckedException In case of exception.
+     * @throws IgniteCheckedException In case of exception.
      */
     protected void processOutOp(int type, PortableRawWriterEx writer) throws IgniteCheckedException
{
         throwUnsupported(type);
@@ -242,11 +257,24 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      * @param type Type.
      * @param reader Portable reader.
      * @param writer Portable writer.
+     * @throws IgniteCheckedException In case of exception.
+     */
+    protected void processInStreamOutStream(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer)
+        throws IgniteCheckedException {
+        throwUnsupported(type);
+    }
+
+    /**
+     * Process IN-OUT operation.
+     *
+     * @param type Type.
      * @param arg Argument.
-     * @throws org.apache.ignite.IgniteCheckedException In case of exception.
+     * @param reader Portable reader.
+     * @param writer Portable writer.
+     * @throws IgniteCheckedException In case of exception.
      */
-    protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        @Nullable Object arg) throws IgniteCheckedException {
+    protected void processInObjectStreamOutStream(int type, @Nullable Object arg, PortableRawReaderEx
reader,
+        PortableRawWriterEx writer) throws IgniteCheckedException {
         throwUnsupported(type);
     }
 
@@ -255,7 +283,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget
{
      *
      * @param type Operation type.
      * @return Dummy value which is never returned.
-     * @throws org.apache.ignite.IgniteCheckedException Exception to be thrown.
+     * @throws IgniteCheckedException Exception to be thrown.
      */
     protected <T> T throwUnsupported(int type) throws IgniteCheckedException {
         throw new IgniteCheckedException("Unsupported operation type: " + type);

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index dff9d67..ec8f3e3 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -256,7 +256,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_PUT:
                 cache.put(reader.readObjectDetached(), reader.readObjectDetached());
@@ -369,7 +369,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected Object processInOpObject(int type, PortableRawReaderEx reader)
+    @Override protected Object processInStreamOutObject(int type, PortableRawReaderEx reader)
         throws IgniteCheckedException {
         switch (type) {
             case OP_QRY_SQL:
@@ -501,8 +501,8 @@ public class PlatformCache extends PlatformAbstractTarget {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"IfMayBeConditional", "ConstantConditions"})
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_GET: {
                 writer.writeObjectDetached(cache.get(reader.readObjectDetached()));

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java
index d6dfcdb..ff0d264 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java
@@ -110,7 +110,7 @@ public class PlatformAffinity extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_PARTITION:
                 return aff.partition(reader.readObjectDetached());
@@ -161,8 +161,8 @@ public class PlatformAffinity extends PlatformAbstractTarget {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"IfMayBeConditional", "ConstantConditions"})
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_PRIMARY_PARTITIONS: {
                 UUID nodeId = reader.readObject();
@@ -280,7 +280,7 @@ public class PlatformAffinity extends PlatformAbstractTarget {
             }
 
             default:
-                throwUnsupported(type);
+                super.processInStreamOutStream(type, reader, writer);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
index 1f2a002..6cb5421 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
@@ -109,8 +109,8 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"ConstantConditions", "deprecation"})
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object obj) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_METRICS_FILTERED: {
                 Collection<UUID> ids = PlatformUtils.readCollection(reader);
@@ -190,7 +190,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_PING_NODE:
                 return pingNode(reader.readUuid()) ? TRUE : FALSE;
@@ -200,7 +200,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected Object processInOpObject(int type, PortableRawReaderEx reader) throws
IgniteCheckedException {
+    @Override protected Object processInStreamOutObject(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_FOR_NODE_IDS: {
                 Collection<UUID> ids = PlatformUtils.readCollection(reader);

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
index 2b1f6be..396543a 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
@@ -67,7 +67,7 @@ public class PlatformCompute extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_UNICAST:
                 processClosures(reader.readLong(), reader, false, false);
@@ -162,8 +162,8 @@ public class PlatformCompute extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_EXEC:
                 writer.writeObjectDetached(executeJavaTask(reader, false));
@@ -174,6 +174,7 @@ public class PlatformCompute extends PlatformAbstractTarget {
                 writer.writeObjectDetached(executeJavaTask(reader, true));
 
                 break;
+
             default:
                 throwUnsupported(type);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
index fc9f535..c13725a 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
@@ -83,7 +83,7 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc}  */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_UPDATE:
                 int plc = reader.readInt();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
index befc3bd..741b270 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java
@@ -130,7 +130,7 @@ public class PlatformEvents extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_RECORD_LOCAL:
                 // TODO: GG-10244
@@ -159,8 +159,8 @@ public class PlatformEvents extends PlatformAbstractTarget {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"})
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_LOCAL_QUERY: {
                 Collection<EventAdapter> result =

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
index ffc2ab3..da691de 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java
@@ -81,7 +81,7 @@ public class PlatformMessaging extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_SEND:
                 messaging.send(reader.readObjectDetached(), reader.readObjectDetached());
@@ -131,8 +131,8 @@ public class PlatformMessaging extends PlatformAbstractTarget {
 
     /** {@inheritDoc} */
     @SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"})
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInStreamOutStream(int type, PortableRawReaderEx reader,
PortableRawWriterEx writer)
+        throws IgniteCheckedException {
         switch (type) {
             case OP_REMOTE_LISTEN:{
                 Object nativeFilter = reader.readObjectDetached();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6fceac02/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index d0956f9..9c5b51e 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@ -118,7 +118,7 @@ public class PlatformServices extends PlatformAbstractTarget {
     }
 
     /** {@inheritDoc} */
-    @Override protected int processInOp(int type, PortableRawReaderEx reader) throws IgniteCheckedException
{
+    @Override protected int processInStreamOutLong(int type, PortableRawReaderEx reader)
throws IgniteCheckedException {
         switch (type) {
             case OP_DOTNET_DEPLOY: {
                 ServiceConfiguration cfg = new ServiceConfiguration();
@@ -153,12 +153,12 @@ public class PlatformServices extends PlatformAbstractTarget {
             }
         }
 
-        return super.processInOp(type, reader);
+        return super.processInStreamOutLong(type, reader);
     }
 
     /** {@inheritDoc} */
-    @Override protected void processInOutOp(int type, PortableRawReaderEx reader, PortableRawWriterEx
writer,
-        Object arg) throws IgniteCheckedException {
+    @Override protected void processInObjectStreamOutStream(int type, Object arg, PortableRawReaderEx
reader,
+        PortableRawWriterEx writer) throws IgniteCheckedException {
         switch (type) {
             case OP_DOTNET_SERVICES: {
                 Collection<Service> svcs = services.services(reader.readString());
@@ -209,7 +209,7 @@ public class PlatformServices extends PlatformAbstractTarget {
             }
         }
 
-        super.processInOutOp(type, reader, writer, arg);
+        super.processInObjectStreamOutStream(type, arg, reader, writer);
     }
 
     /** {@inheritDoc} */


Mime
View raw message