From dadc4e3881779ac20f67d7c6ad4daaebf349d7a0 Mon Sep 17 00:00:00 2001 From: Anton Nekipelov <226657+anton-107@users.noreply.github.com> Date: Thu, 8 May 2025 12:47:37 +0200 Subject: [PATCH] sort files in sync events before the events are emitted --- libs/sync/event.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/sync/event.go b/libs/sync/event.go index 643cdb39cc..66e435c7eb 100644 --- a/libs/sync/event.go +++ b/libs/sync/event.go @@ -55,11 +55,9 @@ func (e *EventChanges) IsEmpty() bool { func (e *EventChanges) String() string { var changes []string if len(e.Put) > 0 { - sort.Strings(e.Put) changes = append(changes, "PUT: "+strings.Join(e.Put, ", ")) } if len(e.Delete) > 0 { - sort.Strings(e.Delete) changes = append(changes, "DELETE: "+strings.Join(e.Delete, ", ")) } return strings.Join(changes, ", ") @@ -79,6 +77,8 @@ func (e *EventStart) String() string { } func newEventStart(seq int, put, delete []string, dryRun bool) Event { + sort.Strings(put) + sort.Strings(delete) return &EventStart{ EventBase: newEventBase(seq, EventTypeStart, dryRun), EventChanges: &EventChanges{Put: put, Delete: delete}, @@ -139,6 +139,8 @@ func (e *EventSyncComplete) String() string { } func newEventComplete(seq int, put, delete []string, dryRun bool) Event { + sort.Strings(put) + sort.Strings(delete) return &EventSyncComplete{ EventBase: newEventBase(seq, EventTypeComplete, dryRun), EventChanges: &EventChanges{Put: put, Delete: delete},