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

Jump to bottom

When deleting SQL journal entries also delete corresponding metadata entries #3468

Merged
merged 3 commits into from
Mar 13, 2019
Merged

When deleting SQL journal entries also delete corresponding metadata entries #3468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22c98c0
When deleting persistence journal entries through the common sql impl…
hirzraimund May 24, 2018
0d4ac55
Merge branch 'dev' into fix_sql_journal_delete
Aaronontheweb Feb 18, 2019
36e4116
Merge branch 'dev' into fix_sql_journal_delete
Aaronontheweb Mar 12, 2019
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
8 changes: 5 additions & 3 deletions src/contrib/persistence/Akka.Persistence.Sql.Common/Journal/BatchingSqlJournal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,9 @@ SELECT MAX(u.SeqNr) as SequenceNr
SELECT m.{conventions.SequenceNrColumnName} as SeqNr FROM {conventions.FullMetaTableName} m WHERE m.{conventions.PersistenceIdColumnName} = @PersistenceId) as u";

DeleteBatchSql = $@"
DELETE FROM {conventions.FullJournalTableName}
DELETE FROM {conventions.FullJournalTableName}
WHERE {conventions.PersistenceIdColumnName} = @PersistenceId AND {conventions.SequenceNrColumnName} <= @ToSequenceNr;
DELETE FROM {conventions.FullMetaTableName}
WHERE {conventions.PersistenceIdColumnName} = @PersistenceId AND {conventions.SequenceNrColumnName} <= @ToSequenceNr;";

UpdateSequenceNrSql = $@"
Expand Down Expand Up @@ -908,8 +910,8 @@ protected virtual async Task HandleDeleteMessagesTo(DeleteMessagesTo req, TComma

command.CommandText = DeleteBatchSql;
command.Parameters.Clear();
AddParameter(command, "PersistenceId", DbType.String, persistenceId);
AddParameter(command, "ToSequenceNr", DbType.Int64, toSequenceNr);
AddParameter(command, "@PersistenceId", DbType.String, persistenceId);
AddParameter(command, "@ToSequenceNr", DbType.Int64, toSequenceNr);

await command.ExecuteNonQueryAsync();

Expand Down
4 changes: 3 additions & 1 deletion src/contrib/persistence/Akka.Persistence.Sql.Common/Journal/QueryExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ SELECT MAX(u.SeqNr) as SequenceNr
SELECT m.{Configuration.SequenceNrColumnName} as SeqNr FROM {Configuration.FullMetaTableName} m WHERE m.{Configuration.PersistenceIdColumnName} = @PersistenceId) as u";

DeleteBatchSql = $@"
DELETE FROM {Configuration.FullJournalTableName}
DELETE FROM {Configuration.FullJournalTableName}
WHERE {Configuration.PersistenceIdColumnName} = @PersistenceId AND {Configuration.SequenceNrColumnName} <= @ToSequenceNr;
DELETE FROM {Configuration.FullMetaTableName}
WHERE {Configuration.PersistenceIdColumnName} = @PersistenceId AND {Configuration.SequenceNrColumnName} <= @ToSequenceNr;";

UpdateSequenceNrSql = $@"
Expand Down