[ignite] branch master updated: IGNITE-13164 Thin client: Fix nodeIds format for execute compute tasks request - Fixes #7944.

[alexpl]

This is an automated email from the ASF dual-hosted git repository.

alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 1336f1b  IGNITE-13164 Thin client: Fix nodeIds format for execute 
compute tasks request - Fixes #7944.
1336f1b is described below

commit 1336f1bc454493e102f6c2acecaa03e511d8eb45
Author: Aleksey Plekhanov <plehanov.a...@gmail.com>
AuthorDate: Tue Jun 23 08:13:02 2020 +0500

    IGNITE-13164 Thin client: Fix nodeIds format for execute compute tasks 
request - Fixes #7944.
    
    Signed-off-by: Aleksey Plekhanov <plehanov.a...@gmail.com>
---
 .../apache/ignite/internal/client/thin/ClientComputeImpl.java | 11 ++++++-----
 .../platform/client/compute/ClientExecuteTaskRequest.java     |  2 +-
 .../Apache.Ignite.Core/Impl/Client/Compute/ComputeClient.cs   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
index 3d53c010..81cb0f3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientComputeImpl.java
@@ -34,7 +34,6 @@ import org.apache.ignite.client.ClientException;
 import org.apache.ignite.client.ClientFeatureNotSupportedByServerException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.binary.BinaryRawWriterEx;
-import org.apache.ignite.internal.binary.BinaryWriterExImpl;
 import org.apache.ignite.internal.binary.streams.BinaryHeapInputStream;
 import org.apache.ignite.internal.processors.platform.client.ClientStatus;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -235,20 +234,22 @@ class ClientComputeImpl implements ClientCompute, 
NotificationListener {
                 "client not supported by server node (" + 
ch.clientChannel().serverNodeId() + ')');
         }
 
-        try (BinaryRawWriterEx w = new BinaryWriterExImpl(marsh.context(), 
ch.out(), null, null)) {
+        try (BinaryRawWriterEx w = utils.createBinaryWriter(ch.out())) {
             if (nodeIds == null) // Include all nodes.
                 w.writeInt(0);
             else {
                 w.writeInt(nodeIds.size());
 
-                for (UUID nodeId : nodeIds)
-                    w.writeUuid(nodeId);
+                for (UUID nodeId : nodeIds) {
+                    w.writeLong(nodeId.getMostSignificantBits());
+                    w.writeLong(nodeId.getLeastSignificantBits());
+                }
             }
 
             w.writeByte(flags);
             w.writeLong(timeout);
             w.writeString(taskName);
-            utils.writeObject(ch.out(), arg);
+            w.writeObject(arg);
         }
     }
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
index ce41e37..9f4fc62 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java
@@ -59,7 +59,7 @@ public class ClientExecuteTaskRequest extends ClientRequest {
         nodeIds = U.newHashSet(cnt);
 
         for (int i = 0; i < cnt; i++)
-            nodeIds.add(reader.readUuid());
+            nodeIds.add(new UUID(reader.readLong(), reader.readLong()));
 
         flags = reader.readByte();
 
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Compute/ComputeClient.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Compute/ComputeClient.cs
index 4ef2a134..a02608f 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Compute/ComputeClient.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Compute/ComputeClient.cs
@@ -147,7 +147,7 @@ namespace Apache.Ignite.Core.Impl.Client.Compute
 
                 foreach (var node in nodes)
                 {
-                    writer.WriteGuid(node.Id);
+                    BinaryUtils.WriteGuid(node.Id, ctx.Stream);
                 }
             }
             else