Skip to content

Commit f914b57

Browse files
committed
Fix CommandTimeout issue introduced in 1.1.2
Test Plan: https://app.circleci.com/pipelines/github/memsql/SingleStoreNETConnector/297/workflows/ecb29d65-7119-473d-8f71-1beefa5c288a Reviewers: pmishchenko-ua Reviewed By: pmishchenko-ua Subscribers: engineering-list JIRA Issues: PLAT-6674 Differential Revision: https://grizzly.internal.memcompute.com/D64107
1 parent abec84b commit f914b57

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22
parameters:
33
connector-version:
44
type: string
5-
default: "1.1.2"
5+
default: "1.1.3"
66

77
orbs:
88
win: circleci/[email protected]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Async SingleStore Connector for .NET and .NET Core 1.1.2
1+
# Async SingleStore Connector for .NET and .NET Core 1.1.3
22

33
This is an [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/) data
44
provider for [SingleStore](https://www.singlestore.com/). It provides implementations of

docs/VersionHistory.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
## Release Notes
44

5+
###1.1.3
6+
7+
*Minor release that resolves CommandTimeout issue introduced in 1.1.2
8+
59
###1.1.2
10+
611
*Add `node_id` to `KILL QUERY {connection_id} {node_id}` command used in `Connection.Cancel()`.
712

813
###1.1.1

src/SingleStoreConnector/Core/ServerSession.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella
421421
VerifyState(State.Created);
422422
m_state = State.Connecting;
423423
}
424+
UserID = cs.UserID;
424425

425426
// set activity tags
426427
{

tests/SideBySide/TransactionScopeTests.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,17 @@ public async Task CancelExecuteNonQueryAsync(string connectionString)
653653

654654
using var command = new SingleStoreCommand("SELECT SLEEP(3) INTO @dummy", connection);
655655
using var tokenSource = new CancellationTokenSource(TimeSpan.FromMilliseconds(100));
656-
await command.ExecuteNonQueryAsync(tokenSource.Token);
656+
var interrupted = false;
657+
try
658+
{
659+
await command.ExecuteNonQueryAsync(tokenSource.Token);
660+
}
661+
catch (OperationCanceledException ex)
662+
{
663+
Assert.Contains("Query execution was interrupted", ex.Message);
664+
interrupted = true;
665+
}
666+
Assert.True(interrupted);
657667
}
658668

659669
[SkippableFact(Skip = "need XA transactions which are not supported in SingleStore", Baseline = "Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported.")]

0 commit comments

Comments
 (0)