Skip to content

using await on types implementing IAsyncDisposable #2114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2024
Merged

using await on types implementing IAsyncDisposable #2114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Proto.Persistence.SqlServer/SqlServerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ public SqlServerProvider(
$@"INSERT INTO [{_tableSchema}].[{_tableSnapshots}] (Id, ActorName, SnapshotIndex, SnapshotData) VALUES (@Id, @ActorName, @SnapshotIndex, @SnapshotData)";
}

public Task DeleteEventsAsync(string actorName, long inclusiveToIndex) =>
ExecuteNonQueryAsync(
public async Task DeleteEventsAsync(string actorName, long inclusiveToIndex) =>
await ExecuteNonQueryAsync(
_sqlDeleteEvents,
CreateParameter("ActorName", NVarChar, actorName),
CreateParameter("EventIndex", BigInt, inclusiveToIndex)
);

public Task DeleteSnapshotsAsync(string actorName, long inclusiveToIndex) =>
ExecuteNonQueryAsync(
public async Task DeleteSnapshotsAsync(string actorName, long inclusiveToIndex) =>
await ExecuteNonQueryAsync(
_sqlDeleteSnapshots,
CreateParameter("ActorName", NVarChar, actorName),
CreateParameter("SnapshotIndex", BigInt, inclusiveToIndex)
Expand Down Expand Up @@ -117,9 +117,9 @@ public async Task<long> GetEventsAsync(string actorName, long indexStart, long i
long snapshotIndex = 0;
object snapshotData = null;

using var connection = new SqlConnection(_connectionString);
await using var connection = new SqlConnection(_connectionString);

using var command = new SqlCommand(_sqlReadSnapshot, connection);
await using var command = new SqlCommand(_sqlReadSnapshot, connection);

await connection.OpenAsync().ConfigureAwait(false);

Expand Down Expand Up @@ -151,14 +151,14 @@ await ExecuteNonQueryAsync(
CreateParameter("EventData", NVarChar, JsonConvert.SerializeObject(item.EventData, AllTypeSettings))
).ConfigureAwait(false);

return index++;
return index + 1;
}

public Task PersistSnapshotAsync(string actorName, long index, object snapshot)
public async Task PersistSnapshotAsync(string actorName, long index, object snapshot)
{
var item = new Snapshot(actorName, index, snapshot);

return ExecuteNonQueryAsync(
await ExecuteNonQueryAsync(
_sqlSaveSnapshot,
CreateParameter("Id", NVarChar, item.Id),
CreateParameter("ActorName", NVarChar, item.ActorName),
Expand Down Expand Up @@ -231,13 +231,13 @@ private static SqlParameter CreateParameter(string name, SqlDbType type, object

private async Task ExecuteNonQueryAsync(string sql, params SqlParameter[] parameters)
{
using var connection = new SqlConnection(_connectionString);
await using var connection = new SqlConnection(_connectionString);

using var command = new SqlCommand(sql, connection);
await using var command = new SqlCommand(sql, connection);

await connection.OpenAsync().ConfigureAwait(false);

using var tx = connection.BeginTransaction();
await using var tx = connection.BeginTransaction();

command.Transaction = tx;

Expand Down
Loading