Skip to content

Commit 333a137

Browse files
KirillKurdyukovKirillKurdyukov
committed
refactoring
1 parent c67317d commit 333a137

File tree

5 files changed

+117
-127
lines changed

5 files changed

+117
-127
lines changed

‎src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/PoolManagerTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ public class PoolManagerTests
1010
[Theory]
1111
[InlineData(new[]
1212
{
13-
"MinSessionSize=4", "MinSessionSize=2", "MinSessionSize=3",
14-
"MinSessionSize=4;DisableDiscovery=True", "MinSessionSize=2;DisableDiscovery=True"
13+
"MinSessionSize=1", "MinSessionSize=2", "MinSessionSize=3",
14+
"MinSessionSize=1;DisableDiscovery=True", "MinSessionSize=2;DisableDiscovery=True"
1515
}, 2, 5)] // 2 transports (by the DisableDiscovery flag), 5 pools
1616
[InlineData(
17-
new[] { "MinSessionSize=6", "MinSessionSize=2", "MinSessionSize=3", "MinSessionSize=4", "MinSessionSize=5" },
17+
new[] { "MinSessionSize=1", "MinSessionSize=2", "MinSessionSize=3", "MinSessionSize=4", "MinSessionSize=5" },
1818
1, 5)] // 1 transport, 5 five pools
1919
[InlineData(new[]
20-
{ "MinSessionSize=6", "MinSessionSize=6", "MinSessionSize=2", "MinSessionSize=2", "MinSessionSize=3" }, 1,
20+
{ "MinSessionSize=1", "MinSessionSize=1", "MinSessionSize=2", "MinSessionSize=2", "MinSessionSize=3" }, 1,
2121
3)] // duplicate rows — we expect 1 transport, 3 pools
2222
[InlineData(new[]
2323
{
24-
"MinSessionSize=2;ConnectTimeout=5", "MinSessionSize=2;ConnectTimeout=6", "MinSessionSize=2;ConnectTimeout=7",
25-
"MinSessionSize=2;ConnectTimeout=8", "MinSessionSize=2;ConnectTimeout=9"
24+
"MinSessionSize=1;ConnectTimeout=5", "MinSessionSize=1;ConnectTimeout=6", "MinSessionSize=1;ConnectTimeout=7",
25+
"MinSessionSize=1;ConnectTimeout=8", "MinSessionSize=1;ConnectTimeout=9"
2626
}, 5, 5)] // 5 transport, 5 five pools
2727
[InlineData(new[]
2828
{
29-
"MinSessionSize=4"
29+
"MinSessionSize=1"
3030
}, 1, 1)] // simple case
3131
public async Task PoolManager_CachingAndCleanup(string[] connectionStrings, int expectedDrivers, int expectedPools)
3232
{

‎src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public async Task ExecuteReaderAsync_WhenSelectNull_ThrowFieldIsNull()
6767
dbCommand.CommandText = "SELECT NULL";
6868
var reader = await dbCommand.ExecuteReaderAsync();
6969
await reader.ReadAsync();
70-
7170
Assert.Equal("Field is null.", Assert.Throws<InvalidCastException>(() => reader.GetFloat(0)).Message);
7271
}
7372

‎src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionTests.cs‎

Lines changed: 55 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -110,40 +110,40 @@ public async Task SetNulls_WhenTableAllTypes_SussesSet()
110110
var ydbCommand = ydbConnection.CreateCommand();
111111
var tableName = "AllTypes_" + Random.Shared.Next();
112112

113-
ydbCommand.CommandText = @$"
114-
CREATE TABLE {tableName} (
115-
id INT32,
116-
bool_column BOOL,
117-
bigint_column INT64,
118-
smallint_column INT16,
119-
tinyint_column INT8,
120-
float_column FLOAT,
121-
double_column DOUBLE,
122-
decimal_column DECIMAL(22,9),
123-
uint8_column UINT8,
124-
uint16_column UINT16,
125-
uint32_column UINT32,
126-
uint64_column UINT64,
127-
text_column TEXT,
128-
binary_column BYTES,
129-
json_column JSON,
130-
jsondocument_column JSONDOCUMENT,
131-
date_column DATE,
132-
datetime_column DATETIME,
133-
timestamp_column TIMESTAMP,
134-
interval_column INTERVAL,
135-
PRIMARY KEY (id)
136-
)
137-
";
113+
ydbCommand.CommandText = $"""
114+
CREATE TABLE {tableName} (
115+
id INT32,
116+
bool_column BOOL,
117+
bigint_column INT64,
118+
smallint_column INT16,
119+
tinyint_column INT8,
120+
float_column FLOAT,
121+
double_column DOUBLE,
122+
decimal_column DECIMAL(22,9),
123+
uint8_column UINT8,
124+
uint16_column UINT16,
125+
uint32_column UINT32,
126+
uint64_column UINT64,
127+
text_column TEXT,
128+
binary_column BYTES,
129+
json_column JSON,
130+
jsondocument_column JSONDOCUMENT,
131+
date_column DATE,
132+
datetime_column DATETIME,
133+
timestamp_column TIMESTAMP,
134+
interval_column INTERVAL,
135+
PRIMARY KEY (id)
136+
)
137+
""";
138138
await ydbCommand.ExecuteNonQueryAsync();
139-
ydbCommand.CommandText = @$"
140-
INSERT INTO {tableName}
141-
(id, bool_column, bigint_column, smallint_column, tinyint_column, float_column, double_column, decimal_column,
142-
uint8_column, uint16_column, uint32_column, uint64_column, text_column, binary_column, json_column,
143-
jsondocument_column, date_column, datetime_column, timestamp_column, interval_column) VALUES
144-
(@name1, @name2, @name3, @name4, @name5, @name6, @name7, @name8, @name9, @name10, @name11, @name12, @name13, @name14,
145-
@name15, @name16, @name17, @name18, @name19, @name20);
146-
";
139+
ydbCommand.CommandText =
140+
$"""
141+
INSERT INTO {tableName} (id, bool_column, bigint_column, smallint_column, tinyint_column, float_column,
142+
double_column, decimal_column, uint8_column, uint16_column, uint32_column, uint64_column, text_column,
143+
binary_column, json_column, jsondocument_column, date_column, datetime_column, timestamp_column,
144+
interval_column) VALUES (@name1, @name2, @name3, @name4, @name5, @name6, @name7, @name8, @name9, @name10,
145+
@name11, @name12, @name13, @name14, @name15, @name16, @name17, @name18, @name19, @name20);
146+
""";
147147

148148
ydbCommand.Parameters.Add(new YdbParameter { ParameterName = "name1", DbType = DbType.Int32, Value = null });
149149
ydbCommand.Parameters.Add(new YdbParameter { ParameterName = "name2", DbType = DbType.Boolean, Value = null });
@@ -198,7 +198,7 @@ public async Task OpenAsync_WhenCancelTokenIsCanceled_ThrowYdbException()
198198
await using var connection = CreateConnection();
199199
connection.ConnectionString = ConnectionString + ";MinSessionPool=1";
200200
using var cts = new CancellationTokenSource();
201-
cts.Cancel();
201+
await cts.CancelAsync();
202202
await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await connection.OpenAsync(cts.Token));
203203
Assert.Equal(ConnectionState.Closed, connection.State);
204204
}
@@ -210,7 +210,7 @@ public async Task YdbDataReader_WhenCancelTokenIsCanceled_ThrowYdbException()
210210
var command = new YdbCommand(connection) { CommandText = "SELECT 1; SELECT 1; SELECT 1;" };
211211
var ydbDataReader = await command.ExecuteReaderAsync();
212212
using var cts = new CancellationTokenSource();
213-
cts.Cancel();
213+
await cts.CancelAsync();
214214

215215
await ydbDataReader.ReadAsync(cts.Token); // first part in memory
216216
Assert.False(ydbDataReader.IsClosed);
@@ -305,10 +305,10 @@ public async Task BulkUpsertImporter_HappyPath_Add_Flush()
305305
{
306306
var tableName = $"BulkImporter_{Guid.NewGuid():N}";
307307

308-
await using var conn = await CreateOpenConnectionAsync();
308+
await using var ydbConnection = await CreateOpenConnectionAsync();
309309
try
310310
{
311-
await using (var createCmd = conn.CreateCommand())
311+
await using (var createCmd = ydbConnection.CreateCommand())
312312
{
313313
createCmd.CommandText = $"""
314314
CREATE TABLE {tableName} (
@@ -322,25 +322,25 @@ PRIMARY KEY (Id)
322322

323323
var columns = new[] { "Id", "Name" };
324324

325-
var importer = conn.BeginBulkUpsertImport(tableName, columns);
325+
var importer = ydbConnection.BeginBulkUpsertImport(tableName, columns);
326326

327327
await importer.AddRowAsync(1, "Alice");
328328
await importer.AddRowAsync(2, "Bob");
329329
await importer.FlushAsync();
330330

331-
await using (var checkCmd = conn.CreateCommand())
331+
await using (var checkCmd = ydbConnection.CreateCommand())
332332
{
333333
checkCmd.CommandText = $"SELECT COUNT(*) FROM {tableName}";
334334
var count = Convert.ToInt32(await checkCmd.ExecuteScalarAsync());
335335
Assert.Equal(2, count);
336336
}
337337

338-
importer = conn.BeginBulkUpsertImport(tableName, columns);
338+
importer = ydbConnection.BeginBulkUpsertImport(tableName, columns);
339339
await importer.AddRowAsync(3, "Charlie");
340340
await importer.AddRowAsync(4, "Diana");
341341
await importer.FlushAsync();
342342

343-
await using (var checkCmd = conn.CreateCommand())
343+
await using (var checkCmd = ydbConnection.CreateCommand())
344344
{
345345
checkCmd.CommandText = $"SELECT Name FROM {tableName} ORDER BY Id";
346346
var names = new List<string>();
@@ -355,7 +355,7 @@ PRIMARY KEY (Id)
355355
}
356356
finally
357357
{
358-
await using var dropCmd = conn.CreateCommand();
358+
await using var dropCmd = ydbConnection.CreateCommand();
359359
dropCmd.CommandText = $"DROP TABLE {tableName}";
360360
await dropCmd.ExecuteNonQueryAsync();
361361
}
@@ -365,31 +365,25 @@ PRIMARY KEY (Id)
365365
public async Task BulkUpsertImporter_ThrowsOnInvalidRowCount()
366366
{
367367
var tableName = $"BulkImporter_{Guid.NewGuid():N}";
368-
await using var conn = await CreateOpenConnectionAsync();
368+
await using var ydbConnection = await CreateOpenConnectionAsync();
369369
try
370370
{
371-
await using (var createCmd = conn.CreateCommand())
371+
await using (var createCmd = ydbConnection.CreateCommand())
372372
{
373-
createCmd.CommandText = $"""
374-
CREATE TABLE {tableName} (
375-
Id Int32,
376-
Name Utf8,
377-
PRIMARY KEY (Id)
378-
)
379-
""";
373+
createCmd.CommandText = $"CREATE TABLE {tableName} (Id Int32, Name Utf8, PRIMARY KEY (Id))";
380374
await createCmd.ExecuteNonQueryAsync();
381375
}
382376

383377
var columns = new[] { "Id", "Name" };
384378

385-
var importer = conn.BeginBulkUpsertImport(tableName, columns);
379+
var importer = ydbConnection.BeginBulkUpsertImport(tableName, columns);
386380

387381
await Assert.ThrowsAsync<ArgumentException>(async () => await importer.AddRowAsync(1));
388382
await Assert.ThrowsAsync<ArgumentException>(async () => await importer.AddRowAsync(2));
389383
}
390384
finally
391385
{
392-
await using var dropCmd = conn.CreateCommand();
386+
await using var dropCmd = ydbConnection.CreateCommand();
393387
dropCmd.CommandText = $"DROP TABLE {tableName}";
394388
await dropCmd.ExecuteNonQueryAsync();
395389
}
@@ -401,12 +395,12 @@ public async Task BulkUpsertImporter_MultipleImporters_Parallel()
401395
var table1 = $"BulkImporter_{Guid.NewGuid():N}_1";
402396
var table2 = $"BulkImporter_{Guid.NewGuid():N}_2";
403397

404-
var conn = await CreateOpenConnectionAsync();
398+
await using var ydbConnection = await CreateOpenConnectionAsync();
405399
try
406400
{
407401
foreach (var table in new[] { table1, table2 })
408402
{
409-
await using var createCmd = conn.CreateCommand();
403+
await using var createCmd = ydbConnection.CreateCommand();
410404
createCmd.CommandText = $"""
411405
CREATE TABLE {table} (
412406
Id Int32,
@@ -422,7 +416,7 @@ PRIMARY KEY (Id)
422416
await Task.WhenAll(
423417
Task.Run(async () =>
424418
{
425-
var importer = conn.BeginBulkUpsertImport(table1, columns);
419+
var importer = ydbConnection.BeginBulkUpsertImport(table1, columns);
426420
var rows = Enumerable.Range(0, 20)
427421
.Select(i => new object[] { i, $"A{i}" })
428422
.ToArray();
@@ -432,7 +426,7 @@ await Task.WhenAll(
432426
}),
433427
Task.Run(async () =>
434428
{
435-
var importer = conn.BeginBulkUpsertImport(table2, columns);
429+
var importer = ydbConnection.BeginBulkUpsertImport(table2, columns);
436430
var rows = Enumerable.Range(0, 20)
437431
.Select(i => new object[] { i, $"B{i}" })
438432
.ToArray();
@@ -444,7 +438,7 @@ await Task.WhenAll(
444438

445439
foreach (var table in new[] { table1, table2 })
446440
{
447-
await using var checkCmd = conn.CreateCommand();
441+
await using var checkCmd = ydbConnection.CreateCommand();
448442
checkCmd.CommandText = $"SELECT COUNT(*) FROM {table}";
449443
var count = Convert.ToInt32(await checkCmd.ExecuteScalarAsync());
450444
Assert.Equal(20, count);
@@ -454,24 +448,22 @@ await Task.WhenAll(
454448
{
455449
foreach (var table in new[] { table1, table2 })
456450
{
457-
await using var dropCmd = conn.CreateCommand();
451+
await using var dropCmd = ydbConnection.CreateCommand();
458452
dropCmd.CommandText = $"DROP TABLE {table}";
459453
await dropCmd.ExecuteNonQueryAsync();
460454
}
461-
462-
await conn.DisposeAsync();
463455
}
464456
}
465457

466458
[Fact]
467459
public async Task BulkUpsertImporter_ThrowsOnNonexistentTable()
468460
{
469461
var tableName = $"Nonexistent_{Guid.NewGuid():N}";
470-
await using var conn = await CreateOpenConnectionAsync();
462+
await using var ydbConnection = await CreateOpenConnectionAsync();
471463

472464
var columns = new[] { "Id", "Name" };
473465

474-
var importer = conn.BeginBulkUpsertImport(tableName, columns);
466+
var importer = ydbConnection.BeginBulkUpsertImport(tableName, columns);
475467

476468
await importer.AddRowAsync(1, "NotExists");
477469

‎src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbParameterCollectionTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public class YdbParameterCollectionTests
1111

1212
public YdbParameterCollectionTests()
1313
{
14-
_ydbParameterCollection = new YdbParameterCollection();
15-
14+
_ydbParameterCollection = [];
1615
_ydbParameterCollection.AddWithValue("$param1", 1);
1716
_ydbParameterCollection.AddWithValue("$param2", 1.0);
1817
_ydbParameterCollection.AddWithValue("$param3", DbType.String, "text");

0 commit comments

Comments
 (0)