From 6fff12ed033669454a7b736d6767a417c0652692 Mon Sep 17 00:00:00 2001 From: xqrzd <4950876+xqrzd@users.noreply.github.com> Date: Sun, 23 Jul 2023 14:54:20 -0400 Subject: [PATCH] Update nuget packages + cleanup (#257) --- .vscode/settings.json | 1 + src/Knet.Kudu.Client/Connection/KuduConnection.cs | 11 ++++------- src/Knet.Kudu.Client/Knet.Kudu.Client.csproj | 4 ++-- src/Knet.Kudu.Client/Mapper/ColumnNameMatcher.cs | 6 ++---- src/Knet.Kudu.Client/Requests/ScanRequest.cs | 1 - src/Knet.Kudu.Client/Util/DecimalUtil.cs | 4 ++-- .../Knet.Kudu.Client.FunctionalTests.csproj | 6 +++--- test/Knet.Kudu.Client.FunctionalTests/ScannerTests.cs | 2 +- .../Knet.Kudu.Client.Tests.csproj | 4 ++-- test/Knet.Kudu.Client.Tests/SchemaTests.cs | 2 +- 10 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9ff8d37a..d855e307 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { + "dotnet.defaultSolution": "kudu-client-net.sln", "files.exclude": { "**/bin": true, "**/obj": true diff --git a/src/Knet.Kudu.Client/Connection/KuduConnection.cs b/src/Knet.Kudu.Client/Connection/KuduConnection.cs index 12833711..f8632ed2 100644 --- a/src/Knet.Kudu.Client/Connection/KuduConnection.cs +++ b/src/Knet.Kudu.Client/Connection/KuduConnection.cs @@ -196,14 +196,14 @@ private SequencePosition ProcessMessages(ReadOnlySequence buffer, ParserCo while (KuduMessageParser.TryParse(ref reader, parserContext)) { - HandleRpc(parserContext); + CompleteInflightRpc(parserContext); parserContext.Reset(); } return reader.Position; } - private void HandleRpc(ParserContext parserContext) + private void CompleteInflightRpc(ParserContext parserContext) { var header = parserContext.Header!; var callId = header.CallId; @@ -272,15 +272,12 @@ private Exception GetException(ErrorStatusPB error) private int AddInflightRpc(InflightRpc inflightRpc) { - int callId; - lock (_inflightRpcs) { - callId = _nextCallId++; + int callId = _nextCallId++; _inflightRpcs.Add(callId, inflightRpc); + return callId; } - - return callId; } private void RemoveInflightRpc(int callId) diff --git a/src/Knet.Kudu.Client/Knet.Kudu.Client.csproj b/src/Knet.Kudu.Client/Knet.Kudu.Client.csproj index bba68cee..aac56ff1 100644 --- a/src/Knet.Kudu.Client/Knet.Kudu.Client.csproj +++ b/src/Knet.Kudu.Client/Knet.Kudu.Client.csproj @@ -35,8 +35,8 @@ - - + + diff --git a/src/Knet.Kudu.Client/Mapper/ColumnNameMatcher.cs b/src/Knet.Kudu.Client/Mapper/ColumnNameMatcher.cs index 6dfe9261..ec5b4122 100644 --- a/src/Knet.Kudu.Client/Mapper/ColumnNameMatcher.cs +++ b/src/Knet.Kudu.Client/Mapper/ColumnNameMatcher.cs @@ -48,13 +48,11 @@ public bool TryGetColumn(string destinationName, [NotNullWhen(true)] out T? colu if (StringComparer.OrdinalIgnoreCase.Equals(destinationName, projectedName)) { - if (caseInsensitiveMatch is null) - caseInsensitiveMatch = column; + caseInsensitiveMatch ??= column; } else { - if (firstMatch is null) - firstMatch = column; + firstMatch ??= column; } } diff --git a/src/Knet.Kudu.Client/Requests/ScanRequest.cs b/src/Knet.Kudu.Client/Requests/ScanRequest.cs index bbfab1db..37919163 100644 --- a/src/Knet.Kudu.Client/Requests/ScanRequest.cs +++ b/src/Knet.Kudu.Client/Requests/ScanRequest.cs @@ -3,7 +3,6 @@ using Google.Protobuf; using Google.Protobuf.Collections; using Knet.Kudu.Client.Exceptions; -using Knet.Kudu.Client.Protobuf; using Knet.Kudu.Client.Protobuf.Tserver; using Knet.Kudu.Client.Protocol; using Knet.Kudu.Client.Scanner; diff --git a/src/Knet.Kudu.Client/Util/DecimalUtil.cs b/src/Knet.Kudu.Client/Util/DecimalUtil.cs index ec72be74..a5f8166d 100644 --- a/src/Knet.Kudu.Client/Util/DecimalUtil.cs +++ b/src/Knet.Kudu.Client/Util/DecimalUtil.cs @@ -20,7 +20,7 @@ public static class DecimalUtil public const int MaxDecimal128Precision = 38; public static readonly Int128 MaxUnscaledDecimal128 = new( // 99999999999999999999999999999999999999 - 0x4B3B4CA85A86C47A, 0x98A223FFFFFFFFF); + 0x4b3b4ca85a86c47a, 0x98a223fffffffff); public static readonly Int128 MinUnscaledDecimal128 = -MaxUnscaledDecimal128; public const int Decimal128Size = 16; @@ -318,7 +318,7 @@ private struct DecimalAccessor // Scale mask for the flags field. This byte in the flags field contains // the power of 10 to divide the Decimal value by. The scale byte must // contain a value between 0 and 28 inclusive. - private const int ScaleMask = 0x00FF0000; + private const int ScaleMask = 0x00ff0000; // Number of bits scale is shifted by. private const int ScaleShift = 16; diff --git a/test/Knet.Kudu.Client.FunctionalTests/Knet.Kudu.Client.FunctionalTests.csproj b/test/Knet.Kudu.Client.FunctionalTests/Knet.Kudu.Client.FunctionalTests.csproj index 20d852c3..d2cc4b58 100644 --- a/test/Knet.Kudu.Client.FunctionalTests/Knet.Kudu.Client.FunctionalTests.csproj +++ b/test/Knet.Kudu.Client.FunctionalTests/Knet.Kudu.Client.FunctionalTests.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/test/Knet.Kudu.Client.FunctionalTests/ScannerTests.cs b/test/Knet.Kudu.Client.FunctionalTests/ScannerTests.cs index ea19d601..ac008b46 100644 --- a/test/Knet.Kudu.Client.FunctionalTests/ScannerTests.cs +++ b/test/Knet.Kudu.Client.FunctionalTests/ScannerTests.cs @@ -467,7 +467,7 @@ public async Task TestDiffScan() } else if (type == RowOperation.Delete) { - Assert.True(false, "Shouldn't see any DELETEs"); + Assert.Fail("Shouldn't see any DELETEs"); } else { diff --git a/test/Knet.Kudu.Client.Tests/Knet.Kudu.Client.Tests.csproj b/test/Knet.Kudu.Client.Tests/Knet.Kudu.Client.Tests.csproj index 6e8d5d73..54e37f34 100644 --- a/test/Knet.Kudu.Client.Tests/Knet.Kudu.Client.Tests.csproj +++ b/test/Knet.Kudu.Client.Tests/Knet.Kudu.Client.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/test/Knet.Kudu.Client.Tests/SchemaTests.cs b/test/Knet.Kudu.Client.Tests/SchemaTests.cs index 71a93bc0..fcd461cc 100644 --- a/test/Knet.Kudu.Client.Tests/SchemaTests.cs +++ b/test/Knet.Kudu.Client.Tests/SchemaTests.cs @@ -12,7 +12,7 @@ public void SingleInt8() var schema = GetSchema(builder); - Assert.Equal(1, schema.Columns.Count); + Assert.Single(schema.Columns); Assert.False(schema.HasNullableColumns); Assert.Equal(0, schema.VarLengthColumnCount); Assert.Equal(1, schema.RowAllocSize);