Skip to content

Commit 4ae793a

Browse files
committed
Small fix and remove unneeded code
1 parent 9edffca commit 4ae793a

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/progaudi.tarantool/IRequestWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ internal interface IRequestWriter : IDisposable
99

1010
bool IsConnected { get; }
1111

12-
Task Write(ArraySegment<byte> header, ArraySegment<byte> body);
12+
void Write(ArraySegment<byte> header, ArraySegment<byte> body);
1313
}
1414
}

src/progaudi.tarantool/LogicalConnection.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ private async Task<TResponse> SendRequestImpl<TRequest, TResponse>(TRequest requ
140140
var requestId = _requestIdCounter.GetRequestId();
141141
var responseTask = _responseReader.GetResponseTask(requestId);
142142

143-
var headerBuffer = CreateAndSerializeBuffer(request, requestId, bodyBuffer, out var headerLength);
144-
await _requestWriter.Write(
145-
new ArraySegment<byte>(headerBuffer, 0, Constants.PacketSizeBufferSize + (int) headerLength),
143+
var headerBuffer = CreateAndSerializeHeader(request, requestId, bodyBuffer);
144+
_requestWriter.Write(
145+
headerBuffer,
146146
new ArraySegment<byte>(bodyBuffer, 0, bodyBuffer.Length));
147147

148148
try
@@ -175,11 +175,15 @@ private static string ToReadableString(byte[] bytes)
175175
return string.Join(" ", bytes.Select(b => b.ToString("X2")));
176176
}
177177

178-
private byte[] CreateAndSerializeBuffer<TRequest>(
178+
private static string ToReadableString(ArraySegment<byte> bytes)
179+
{
180+
return string.Join(" ", bytes.Select(b => b.ToString("X2")));
181+
}
182+
183+
private ArraySegment<byte> CreateAndSerializeHeader<TRequest>(
179184
TRequest request,
180185
RequestId requestId,
181-
byte[] serializedRequest,
182-
out long headerLength) where TRequest : IRequest
186+
byte[] serializedRequest) where TRequest : IRequest
183187
{
184188
var packetSizeBuffer = new byte[Constants.PacketSizeBufferSize + Constants.MaxHeaderLength];
185189
var stream = new MemoryStream(packetSizeBuffer);
@@ -188,11 +192,12 @@ private byte[] CreateAndSerializeBuffer<TRequest>(
188192
stream.Seek(Constants.PacketSizeBufferSize, SeekOrigin.Begin);
189193
MsgPackSerializer.Serialize(requestHeader, stream, _msgPackContext);
190194

191-
headerLength = stream.Position - Constants.PacketSizeBufferSize;
195+
var lengthAndHeaderLengthByteCount = (int)stream.Position;
196+
var headerLength = lengthAndHeaderLengthByteCount - Constants.PacketSizeBufferSize;
192197
var packetLength = new PacketSize((uint) (headerLength + serializedRequest.Length));
193198
stream.Seek(0, SeekOrigin.Begin);
194199
MsgPackSerializer.Serialize(packetLength, stream, _msgPackContext);
195-
return packetSizeBuffer;
200+
return new ArraySegment<byte>(packetSizeBuffer, 0, lengthAndHeaderLengthByteCount);
196201
}
197202
}
198203
}

src/progaudi.tarantool/RequestWriter.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Threading;
4-
using System.Threading.Tasks;
54
using ProGaudi.Tarantool.Client.Model;
65

76
namespace ProGaudi.Tarantool.Client
@@ -44,7 +43,7 @@ public void BeginWriting()
4443

4544
public bool IsConnected => !_disposed;
4645

47-
public Task Write(ArraySegment<byte> header, ArraySegment<byte> body)
46+
public void Write(ArraySegment<byte> header, ArraySegment<byte> body)
4847
{
4948
if (_disposed)
5049
{
@@ -61,8 +60,6 @@ public Task Write(ArraySegment<byte> header, ArraySegment<byte> body)
6160

6261
if (shouldSignal)
6362
_newRequestsAvailable.Set();
64-
65-
return Task.CompletedTask;
6663
}
6764

6865
public void Dispose()

0 commit comments

Comments
 (0)