Skip to content

Commit 5cee465

Browse files
committed
fix
1 parent 14a2bfe commit 5cee465

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

src/Ydb.Sdk/src/Ado/BulkUpsert/IBulkUpsertImporter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ public interface IBulkUpsertImporter : IAsyncDisposable
1212

1313
ValueTask FlushAsync(CancellationToken cancellationToken = default);
1414
IReadOnlyList<Ydb.Value> GetBufferedRows();
15-
}
15+
}

src/Ydb.Sdk/src/Ado/BulkUpsert/YdbBulkUpsertImporter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@ private void ThrowIfDisposed()
123123
if (_disposed)
124124
throw new ObjectDisposedException(nameof(BulkUpsertImporter));
125125
}
126-
}
126+
}

src/Ydb.Sdk/src/Ado/YdbConnection.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22
using System.Data.Common;
33
using System.Diagnostics.CodeAnalysis;
44
using Ydb.Sdk.Ado.BulkUpsert;
5-
using Ydb.Sdk.Ado.Internal;
65
using Ydb.Sdk.Ado.Session;
76
using Ydb.Sdk.Services.Query;
8-
using Ydb.Table;
9-
using Ydb.Table.V1;
107
using static System.Data.IsolationLevel;
118

129
namespace Ydb.Sdk.Ado;
1310

1411
public sealed class YdbConnection : DbConnection
1512
{
1613
private const int MaxSendBufferSize = 64 * 1024 * 1024;
17-
14+
1815
private static readonly StateChangeEventArgs ClosedToOpenEventArgs =
1916
new(ConnectionState.Closed, ConnectionState.Open);
2017

@@ -67,10 +64,10 @@ public IBulkUpsertImporter BeginBulkUpsertImport(
6764
if (CurrentTransaction is { Completed: false })
6865
throw new InvalidOperationException("BulkUpsert cannot be used inside an active transaction.");
6966

70-
var database = (ConnectionStringBuilder.Database ?? "").TrimEnd('/');
67+
var database = ConnectionStringBuilder.Database.TrimEnd('/');
7168
var tablePath = string.IsNullOrEmpty(database) ? name : $"{database}/{name}";
7269

73-
return new BulkUpsertImporter(this, tablePath, columns, types, MaxSendBufferSize);
70+
return new BulkUpsertImporter(this, tablePath, columns, types);
7471
}
7572

7673
protected override YdbTransaction BeginDbTransaction(IsolationLevel isolationLevel)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ PRIMARY KEY (Id)
330330
}
331331

332332
var columns = new[] { "Id", "Name" };
333-
var types = new[] {
333+
var types = new[]
334+
{
334335
new Type { TypeId = Type.Types.PrimitiveTypeId.Int32 },
335336
new Type { TypeId = Type.Types.PrimitiveTypeId.Utf8 }
336337
};
@@ -402,7 +403,8 @@ PRIMARY KEY (Id)
402403
}
403404

404405
var columns = new[] { "Id", "Name" };
405-
var types = new[] {
406+
var types = new[]
407+
{
406408
new Type { TypeId = Type.Types.PrimitiveTypeId.Int32 },
407409
new Type { TypeId = Type.Types.PrimitiveTypeId.Utf8 }
408410
};
@@ -418,10 +420,7 @@ await Assert.ThrowsAsync<ArgumentException>(async () =>
418420
{
419421
new[] { YdbValue.MakeInt32(2) }
420422
};
421-
await Assert.ThrowsAsync<ArgumentException>(async () =>
422-
{
423-
await importer.AddRowsAsync(rows);
424-
});
423+
await Assert.ThrowsAsync<ArgumentException>(async () => { await importer.AddRowsAsync(rows); });
425424
}
426425
}
427426
finally
@@ -453,7 +452,8 @@ PRIMARY KEY (Id)
453452
}
454453

455454
var columns = new[] { "Id", "Name" };
456-
var types = new[] {
455+
var types = new[]
456+
{
457457
new Type { TypeId = Type.Types.PrimitiveTypeId.Int32 },
458458
new Type { TypeId = Type.Types.PrimitiveTypeId.Utf8 }
459459
};
@@ -504,13 +504,13 @@ await Task.WhenAll(
504504
Task.Run(async () =>
505505
{
506506
await using var importer = conn.BeginBulkUpsertImport(table1, columns, types);
507-
for (int i = 0; i < 20; i++)
507+
for (var i = 0; i < 20; i++)
508508
await importer.AddRowAsync(YdbValue.MakeInt32(i), YdbValue.MakeUtf8($"A{i}"));
509509
}),
510510
Task.Run(async () =>
511511
{
512512
await using var importer = conn.BeginBulkUpsertImport(table2, columns, types);
513-
for (int i = 0; i < 20; i++)
513+
for (var i = 0; i < 20; i++)
514514
await importer.AddRowAsync(YdbValue.MakeInt32(i), YdbValue.MakeUtf8($"B{i}"));
515515
})
516516
);

0 commit comments

Comments
 (0)