YdbCommand.Execute* throws OperationCanceledException, if the CancellationToken has already been cancelled before the method is called. (#502)

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,4 +1,5 @@
-- ADO.NET: `YdbConnection.OpenAsync` throws OperationCancelException when the `CancellationToken` is cancelled.
+- ADO.NET: Now `YdbConnection.OpenAsync` and `YdbCommand.Execute*` throw `OperationCanceledException`,
+  if the CancellationToken has already been cancelled before the method is called.
 - Feat ADO.NET: decimal type with arbitrary precision/scale ([#498](https://github.com/ydb-platform/ydb-dotnet-sdk/issues/498)).
 - Fixed bug: interval value parsing in microseconds and double instead of ticks ([#497](https://github.com/ydb-platform/ydb-dotnet-sdk/issues/497)).
 - ADO.NET: Changed `IBulkUpsertImporter.AddRowAsync` signature: `object?[] row` → `params object[]`.

src/Ydb.Sdk/src/Ado/YdbCommand.cs

@@ -169,6 +169,8 @@ protected override YdbDataReader ExecuteDbDataReader(CommandBehavior behavior) =
     protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior,
         CancellationToken cancellationToken)
     {
+        cancellationToken.ThrowIfCancellationRequested();
+
         if (YdbConnection.IsBusy)
         {
             throw new YdbOperationInProgressException(YdbConnection);

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

@@ -53,34 +53,4 @@ public override void ExecuteReader_throws_when_transaction_required()
             });
         }
     }
-
-    public override async Task ExecuteReaderAsync_is_canceled()
-    {
-        await using var connection = CreateOpenConnection();
-        await using var command = connection.CreateCommand();
-        command.CommandText = "SELECT 1;";
-        var task = command.ExecuteReaderAsync(CanceledToken);
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
-    }
-
-    public override async Task ExecuteNonQueryAsync_is_canceled()
-    {
-        await using var connection = CreateOpenConnection();
-        await using var command = connection.CreateCommand();
-        command.CommandText = "SELECT 1;";
-        var task = command.ExecuteNonQueryAsync(CanceledToken);
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
-    }
-
-    public override async Task ExecuteScalarAsync_is_canceled()
-    {
-        await using var connection = CreateOpenConnection();
-        await using var command = connection.CreateCommand();
-        command.CommandText = "SELECT 1;";
-        var task = command.ExecuteScalarAsync(CanceledToken);
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
-    }
 }

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

@@ -246,21 +246,19 @@ public async Task ExecuteMethods_WhenCancelTokenIsCanceled_ConnectionIsBroken()
         await using var connection = await CreateOpenConnectionAsync();
         var command = new YdbCommand(connection) { CommandText = "SELECT 1; SELECT 1; SELECT 1;" };
         using var cts = new CancellationTokenSource();
-        cts.Cancel();
+        await cts.CancelAsync();
 
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteReaderAsync(cts.Token))).Code);
-        Assert.Equal(ConnectionState.Broken, connection.State);
-        // ReSharper disable once MethodSupportsCancellation
-        await connection.OpenAsync();
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteScalarAsync(cts.Token))).Code);
-        Assert.Equal(ConnectionState.Broken, connection.State);
-        // ReSharper disable once MethodSupportsCancellation
-        await connection.OpenAsync();
-        Assert.Equal(StatusCode.ClientTransportTimeout,
-            (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteNonQueryAsync(cts.Token))).Code);
-        Assert.Equal(ConnectionState.Broken, connection.State);
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
+            await command.ExecuteReaderAsync(cts.Token));
+        Assert.Equal(ConnectionState.Open, connection.State); // state is not changed
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
+            await command.ExecuteScalarAsync(cts.Token));
+        Assert.Equal(ConnectionState.Open, connection.State); // state is not changed
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
+            await command.ExecuteNonQueryAsync(cts.Token));
+        Assert.Equal(ConnectionState.Open, connection.State);
     }
 
     [Fact]