Skip to content
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

Replaced if...update...insert with MERGE syntax to avoid deadlock #319

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Replaced if...update...insert with MERGE syntax to avoid deadlock #319

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
36 changes: 17 additions & 19 deletions src/Akka.Persistence.SqlServer/Snapshot/SqlServerQueryExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,29 +51,27 @@ CREATE INDEX IX_{configuration.SnapshotTableName}_{configuration.TimestampColumn
SET @Manifest_sized = @Manifest;
SET @Payload_sized = @Payload;
SET @PersistenceId_sized = @PersistenceId;
IF (
SELECT COUNT(*)
FROM {configuration.FullSnapshotTableName}
WHERE {configuration.SequenceNrColumnName} = @SequenceNr
AND {configuration.PersistenceIdColumnName} = @PersistenceId_sized) > 0
UPDATE {configuration.FullSnapshotTableName}
SET
{configuration.PersistenceIdColumnName} = @PersistenceId_sized,
{configuration.SequenceNrColumnName} = @SequenceNr,
{configuration.TimestampColumnName} = @Timestamp,
{configuration.ManifestColumnName} = @Manifest_sized,
{configuration.PayloadColumnName} = @Payload_sized,
{configuration.SerializerIdColumnName} = @SerializerId
WHERE {configuration.SequenceNrColumnName} = @SequenceNr
AND {configuration.PersistenceIdColumnName} = @PersistenceId_sized ELSE
INSERT INTO {configuration.FullSnapshotTableName} (

MERGE {configuration.FullSnapshotTableName} AS DEST
USING (SELECT @PersistenceId_sized P, @SequenceNr N, @Timestamp T, @Manifest_sized M, @Payload_sized L, @SerializerId S) AS SRC
ON DEST.{configuration.SequenceNrColumnName} = SRC.N
AND DEST.{configuration.PersistenceIdColumnName} = SRC.P

WHEN NOT MATCHED THEN INSERT (
{configuration.PersistenceIdColumnName},
{configuration.SequenceNrColumnName},
{configuration.TimestampColumnName},
{configuration.ManifestColumnName},
{configuration.PayloadColumnName},
{configuration.SerializerIdColumnName})
VALUES (@PersistenceId_sized, @SequenceNr, @Timestamp, @Manifest_sized, @Payload_sized, @SerializerId);";
{configuration.SerializerIdColumnName})
VALUES (SRC.P, SRC.N, SRC.T, SRC.M, SRC.L, SRC.S)
WHEN MATCHED THEN UPDATE SET
DEST.{configuration.PersistenceIdColumnName} = SRC.P,
DEST.{configuration.SequenceNrColumnName} = SRC.N,
DEST.{configuration.TimestampColumnName} = SRC.T,
DEST.{configuration.ManifestColumnName} = SRC.M,
DEST.{configuration.PayloadColumnName} = SRC.L,
DEST.{configuration.SerializerIdColumnName} = SRC.S;";

SelectSnapshotSql = $@"
DECLARE @PersistenceId_sized NVARCHAR(255);
Expand Down Expand Up @@ -127,4 +125,4 @@ protected override void PreAddParameterToCommand(DbCommand command, DbParameter
}
}
}
}
}