Skip to content

Commit 77bfe26

Browse files
committed
Rename method to ReadByteArray.
This better describes the behaviour and side-effects (allocating a new array) of the method.
1 parent 1aa9a7e commit 77bfe26

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,10 +924,10 @@ private async Task GetRealServerDetailsAsync(IOBehavior ioBehavior, Cancellation
924924
var reader = new ByteArrayReader(payload.ArraySegment);
925925
var length = reader.ReadLengthEncodedIntegerOrNull();
926926
if (length != -1)
927-
connectionId = int.Parse(Encoding.UTF8.GetString(reader.ReadByteString(length)), CultureInfo.InvariantCulture);
927+
connectionId = int.Parse(Encoding.UTF8.GetString(reader.ReadByteArray(length)), CultureInfo.InvariantCulture);
928928
length = reader.ReadLengthEncodedIntegerOrNull();
929929
if (length != -1)
930-
serverVersion = Encoding.UTF8.GetString(reader.ReadByteString(length));
930+
serverVersion = Encoding.UTF8.GetString(reader.ReadByteArray(length));
931931

932932
// OK/EOF payload
933933
payload = await ReceiveReplyAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);

src/MySqlConnector/Protocol/Payloads/AuthenticationMethodSwitchRequestPayload.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static AuthenticationMethodSwitchRequestPayload Create(PayloadData payloa
2626
else
2727
{
2828
name = Encoding.UTF8.GetString(reader.ReadNullTerminatedByteString());
29-
data = reader.ReadByteString(reader.BytesRemaining);
29+
data = reader.ReadByteArray(reader.BytesRemaining);
3030
}
3131
return new AuthenticationMethodSwitchRequestPayload(name, data);
3232
}

src/MySqlConnector/Protocol/Payloads/AuthenticationMoreDataPayload.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static AuthenticationMoreDataPayload Create(PayloadData payload)
1212
{
1313
var reader = new ByteArrayReader(payload.ArraySegment);
1414
reader.ReadByte(Signature);
15-
return new AuthenticationMoreDataPayload(reader.ReadByteString(reader.BytesRemaining));
15+
return new AuthenticationMoreDataPayload(reader.ReadByteArray(reader.BytesRemaining));
1616
}
1717

1818
private AuthenticationMoreDataPayload(byte[] data) => Data = data;

src/MySqlConnector/Protocol/Payloads/ErrorPayload.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ public static ErrorPayload Create(PayloadData payload)
1919
reader.ReadByte(Signature);
2020

2121
var errorCode = reader.ReadUInt16();
22-
var stateMarker = Encoding.ASCII.GetString(reader.ReadByteString(1));
22+
var stateMarker = Encoding.ASCII.GetString(reader.ReadByteArray(1));
2323
string state, message;
2424
if (stateMarker == "#")
2525
{
26-
state = Encoding.ASCII.GetString(reader.ReadByteString(5));
27-
message = Encoding.UTF8.GetString(reader.ReadByteString(payload.ArraySegment.Count - 9));
26+
state = Encoding.ASCII.GetString(reader.ReadByteArray(5));
27+
message = Encoding.UTF8.GetString(reader.ReadByteArray(payload.ArraySegment.Count - 9));
2828
}
2929
else
3030
{
3131
state = "HY000";
32-
message = stateMarker + Encoding.UTF8.GetString(reader.ReadByteString(payload.ArraySegment.Count - 4));
32+
message = stateMarker + Encoding.UTF8.GetString(reader.ReadByteArray(payload.ArraySegment.Count - 4));
3333
}
3434
return new ErrorPayload(errorCode, state, message);
3535
}

src/MySqlConnector/Protocol/Payloads/InitialHandshakePayload.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static InitialHandshakePayload Create(PayloadData payload)
1818
reader.ReadByte(c_protocolVersion);
1919
var serverVersion = reader.ReadNullTerminatedByteString();
2020
var connectionId = reader.ReadInt32();
21-
var authPluginData = reader.ReadByteString(8);
21+
var authPluginData = reader.ReadByteArray(8);
2222
string authPluginName = null;
2323
reader.ReadByte(0);
2424
var protocolCapabilities = (ProtocolCapabilities) reader.ReadUInt16();
@@ -29,10 +29,10 @@ public static InitialHandshakePayload Create(PayloadData payload)
2929
var capabilityFlagsHigh = reader.ReadUInt16();
3030
protocolCapabilities |= (ProtocolCapabilities) (capabilityFlagsHigh << 16);
3131
var authPluginDataLength = reader.ReadByte();
32-
var unused = reader.ReadByteString(10);
32+
var unused = reader.ReadByteArray(10);
3333
if ((protocolCapabilities & ProtocolCapabilities.SecureConnection) != 0)
3434
{
35-
var authPluginData2 = reader.ReadByteString(Math.Max(13, authPluginDataLength - 8));
35+
var authPluginData2 = reader.ReadByteArray(Math.Max(13, authPluginDataLength - 8));
3636
var concatenated = new byte[authPluginData.Length + authPluginData2.Length];
3737
Buffer.BlockCopy(authPluginData, 0, concatenated, 0, authPluginData.Length);
3838
Buffer.BlockCopy(authPluginData2, 0, concatenated,authPluginData.Length, authPluginData2.Length);

src/MySqlConnector/Protocol/Payloads/LocalInfilePayload.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static LocalInfilePayload Create(PayloadData payload)
1414
{
1515
var reader = new ByteArrayReader(payload.ArraySegment);
1616
reader.ReadByte(Signature);
17-
var fileName = Encoding.UTF8.GetString(reader.ReadByteString(reader.BytesRemaining));
17+
var fileName = Encoding.UTF8.GetString(reader.ReadByteArray(reader.BytesRemaining));
1818
return new LocalInfilePayload(fileName);
1919
}
2020

src/MySqlConnector/Protocol/Serialization/ByteArrayReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public byte[] ReadNullOrEofTerminatedByteString()
118118
return substring;
119119
}
120120

121-
public byte[] ReadByteString(int length)
121+
public byte[] ReadByteArray(int length)
122122
{
123123
VerifyRead(length);
124124
var result = new byte[length];

0 commit comments

Comments
 (0)