Skip to content

Commit

Permalink
Fix CommandTimeout issue introduced in 1.1.2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
okramarenko committed Aug 4, 2023
1 parent abec84b commit f914b57
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
parameters:
connector-version:
type: string
default: "1.1.2"
default: "1.1.3"

orbs:
win: circleci/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Async SingleStore Connector for .NET and .NET Core 1.1.2
# Async SingleStore Connector for .NET and .NET Core 1.1.3

This is an [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/) data
provider for [SingleStore](https://www.singlestore.com/). It provides implementations of
Expand Down
5 changes: 5 additions & 0 deletions docs/VersionHistory.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

## Release Notes

###1.1.3

*Minor release that resolves CommandTimeout issue introduced in 1.1.2

###1.1.2

*Add `node_id` to `KILL QUERY {connection_id} {node_id}` command used in `Connection.Cancel()`.

###1.1.1
Expand Down
1 change: 1 addition & 0 deletions src/SingleStoreConnector/Core/ServerSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella
VerifyState(State.Created);
m_state = State.Connecting;
}
UserID = cs.UserID;

// set activity tags
{
Expand Down
12 changes: 11 additions & 1 deletion tests/SideBySide/TransactionScopeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,17 @@ public async Task CancelExecuteNonQueryAsync(string connectionString)

using var command = new SingleStoreCommand("SELECT SLEEP(3) INTO @dummy", connection);
using var tokenSource = new CancellationTokenSource(TimeSpan.FromMilliseconds(100));
await command.ExecuteNonQueryAsync(tokenSource.Token);
var interrupted = false;
try
{
await command.ExecuteNonQueryAsync(tokenSource.Token);
}
catch (OperationCanceledException ex)
{
Assert.Contains("Query execution was interrupted", ex.Message);
interrupted = true;
}
Assert.True(interrupted);
}

[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.")]
Expand Down

0 comments on commit f914b57

Please sign in to comment.