From cfadd700ff47c7ddf44e787d4f37eaad7f33e910 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:56:46 +0530 Subject: [PATCH] [server][file-data] Fix query to mark replication as done --- server/pkg/repo/filedata/repository.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/pkg/repo/filedata/repository.go b/server/pkg/repo/filedata/repository.go index 78dad2aebf..ae024e5d2b 100644 --- a/server/pkg/repo/filedata/repository.go +++ b/server/pkg/repo/filedata/repository.go @@ -196,9 +196,10 @@ func (r *Repository) GetPendingSyncDataAndExtendLock(ctx context.Context, newSyn return &fileData, nil } -// MarkReplicationAsDone marks the pending_sync as false for the file data row +// MarkReplicationAsDone marks the pending_sync as false for the file data row, while +// ensuring that the row is not deleted func (r *Repository) MarkReplicationAsDone(ctx context.Context, row filedata.Row) error { - query := `UPDATE file_data SET pending_sync = false WHERE is_deleted=true and file_id = $1 AND data_type = $2 AND user_id = $3` + query := `UPDATE file_data SET pending_sync = false WHERE is_deleted=false and file_id = $1 AND data_type = $2 AND user_id = $3` _, err := r.DB.ExecContext(ctx, query, row.FileID, string(row.Type), row.UserID) if err != nil { return stacktrace.Propagate(err, "")