You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/09/13 10:26:38 UTC
ignite git commit: Change requestId to long
Repository: ignite
Updated Branches:
refs/heads/ignite-5896 4bbd33067 -> 500b4e59f
Change requestId to long
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/500b4e59
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/500b4e59
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/500b4e59
Branch: refs/heads/ignite-5896
Commit: 500b4e59ff6a25fbbc7670eeb68116a3b850b30e
Parents: 4bbd330
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Sep 13 13:26:22 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Sep 13 13:26:22 2017 +0300
----------------------------------------------------------------------
.../processors/platform/client/ClientBooleanResponse.java | 2 +-
.../processors/platform/client/ClientMessageParser.java | 2 +-
.../processors/platform/client/ClientObjectResponse.java | 2 +-
.../internal/processors/platform/client/ClientRequest.java | 6 +++---
.../processors/platform/client/ClientRequestHandler.java | 2 +-
.../internal/processors/platform/client/ClientResponse.java | 6 +++---
.../client/binary/ClientGetBinaryTypeNameResponse.java | 2 +-
.../client/binary/ClientGetBinaryTypeSchemaResponse.java | 2 +-
.../dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs | 4 ++--
.../dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs | 6 +++---
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientBooleanResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientBooleanResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientBooleanResponse.java
index affda0f..fd17646 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientBooleanResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientBooleanResponse.java
@@ -31,7 +31,7 @@ public class ClientBooleanResponse extends ClientResponse {
*
* @param requestId Request id.
*/
- public ClientBooleanResponse(int requestId, boolean val) {
+ public ClientBooleanResponse(long requestId, boolean val) {
super(requestId);
this.val = val;
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java
index 90ea5d3..54948c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java
@@ -66,7 +66,7 @@ public class ClientMessageParser implements SqlListenerMessageParser {
*
* @param ctx Kernal context.
*/
- public ClientMessageParser(GridKernalContext ctx) {
+ ClientMessageParser(GridKernalContext ctx) {
assert ctx != null;
CacheObjectBinaryProcessorImpl cacheObjProc = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects();
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientObjectResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientObjectResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientObjectResponse.java
index 3865e95..730872f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientObjectResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientObjectResponse.java
@@ -31,7 +31,7 @@ public class ClientObjectResponse extends ClientResponse {
*
* @param requestId Request id.
*/
- public ClientObjectResponse(int requestId, Object val) {
+ public ClientObjectResponse(long requestId, Object val) {
super(requestId);
this.val = val;
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
index ce561d7..134b011 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.odbc.SqlListenerRequest;
*/
public class ClientRequest extends SqlListenerRequest {
/** Request id. */
- private final int requestId;
+ private final long requestId;
/**
* Ctor.
@@ -34,7 +34,7 @@ public class ClientRequest extends SqlListenerRequest {
* @param reader Reader.
*/
public ClientRequest(BinaryRawReader reader) {
- requestId = reader.readInt();
+ requestId = reader.readLong();
}
/**
@@ -42,7 +42,7 @@ public class ClientRequest extends SqlListenerRequest {
*
* @return Data.
*/
- public int getRequestId() {
+ public long getRequestId() {
return requestId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
index 7f019cf..5337239 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java
@@ -35,7 +35,7 @@ public class ClientRequestHandler implements SqlListenerRequestHandler {
*
* @param ctx Kernal context.
*/
- public ClientRequestHandler(GridKernalContext ctx) {
+ ClientRequestHandler(GridKernalContext ctx) {
assert ctx != null;
this.ctx = ctx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
index 5bb37af..3b2fcf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
@@ -26,14 +26,14 @@ import org.jetbrains.annotations.Nullable;
*/
public class ClientResponse extends SqlListenerResponse {
/** Request id. */
- private final int requestId;
+ private final long requestId;
/**
* Ctor.
*
* @param requestId Request id.
*/
- public ClientResponse(int requestId) {
+ public ClientResponse(long requestId) {
super(STATUS_SUCCESS, null);
this.requestId = requestId;
@@ -43,6 +43,6 @@ public class ClientResponse extends SqlListenerResponse {
* Encodes the response data.
*/
public void encode(BinaryRawWriter writer) {
- writer.writeInt(requestId);
+ writer.writeLong(requestId);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeNameResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeNameResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeNameResponse.java
index d57f0df..0827984 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeNameResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeNameResponse.java
@@ -32,7 +32,7 @@ public class ClientGetBinaryTypeNameResponse extends ClientResponse {
*
* @param requestId Request id.
*/
- ClientGetBinaryTypeNameResponse(int requestId, String typeName) {
+ ClientGetBinaryTypeNameResponse(long requestId, String typeName) {
super(requestId);
this.typeName = typeName;
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeSchemaResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeSchemaResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeSchemaResponse.java
index 726096f..e22e2e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeSchemaResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientGetBinaryTypeSchemaResponse.java
@@ -32,7 +32,7 @@ public class ClientGetBinaryTypeSchemaResponse extends ClientResponse {
*
* @param requestId Request id.
*/
- ClientGetBinaryTypeSchemaResponse(int requestId, int[] schema) {
+ ClientGetBinaryTypeSchemaResponse(long requestId, int[] schema) {
super(requestId);
this.schema = schema;
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs
index 06abae8..9e2200f 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs
@@ -62,7 +62,7 @@ namespace Apache.Ignite.Core.Tests.Client
SendRequest(sock, stream =>
{
stream.WriteShort(1); // OP_GET
- stream.WriteInt(1); // Request id.
+ stream.WriteLong(1); // Request id.
var cacheId = BinaryUtils.GetStringHashCode(cache.Name);
stream.WriteInt(cacheId);
stream.WriteByte(0); // Flags (withSkipStore, etc)
@@ -78,7 +78,7 @@ namespace Apache.Ignite.Core.Tests.Client
{
var reader = marsh.StartUnmarshal(stream);
- int requestId = reader.ReadInt();
+ var requestId = reader.ReadLong();
Assert.AreEqual(1, requestId);
var res = reader.ReadObject<string>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/500b4e59/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs
index 786a7c4..83f8fdb 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs
@@ -47,7 +47,7 @@ namespace Apache.Ignite.Core.Impl.Client
private readonly Socket _socket;
/** */
- private int _requestId;
+ private long _requestId;
/// <summary>
/// Initializes a new instance of the <see cref="ClientSocket" /> class.
@@ -74,7 +74,7 @@ namespace Apache.Ignite.Core.Impl.Client
var resBytes = SendReceive(_socket, stream =>
{
stream.WriteShort((short) opId);
- stream.WriteInt(requestId);
+ stream.WriteLong(requestId);
if (writeAction != null)
{
@@ -84,7 +84,7 @@ namespace Apache.Ignite.Core.Impl.Client
using (var stream = new BinaryHeapStream(resBytes))
{
- var resRequestId = stream.ReadInt();
+ var resRequestId = stream.ReadLong();
Debug.Assert(requestId == resRequestId);
if (readFunc != null)