Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Order multi-file updates by file ID

Neeraj Gupta8e86cce25cdc
diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.go
index 7319b14c04..b2f7645bea 100644
--- a/server/pkg/repo/file.go
+++ b/server/pkg/repo/file.go
@@ -1,10 +1,12 @@
package repo
import (
+ "cmp"
"context"
"database/sql"
"errors"
"fmt"
+ "slices"
"strconv"
"strings"
@@ -358,6 +360,9 @@ func (repo *FileRepository) UpdateMagicAttributes(
isPublicMetadata bool,
skipVersion *bool,
) error {
+ slices.SortStableFunc(fileUpdates, func(a, b ente.UpdateMagicMetadata) int {
+ return cmp.Compare(a.ID, b.ID)
+ })
updationTime := time.Microseconds()
tx, err := repo.DB.BeginTx(ctx, nil)
if err != nil {
diff --git a/server/pkg/repo/file_size.go b/server/pkg/repo/file_size.go
index b41ddc7622..86f9752521 100644
--- a/server/pkg/repo/file_size.go
+++ b/server/pkg/repo/file_size.go
@@ -3,6 +3,8 @@ package repo
import (
"context"
"database/sql"
+ "maps"
+ "slices"
"github.com/ente/museum/ente"
"github.com/ente/stacktrace"
@@ -34,8 +36,8 @@ func (repo *FileRepository) UpdateSizeInfo(ctx context.Context, sizeInfo map[int
return stacktrace.Propagate(err, "")
}
defer tx.Rollback()
- for fileID, info := range sizeInfo {
- _, err := tx.ExecContext(ctx, `UPDATE files SET info = $1 WHERE file_id = $2 and info is NULL`, info, fileID)
+ for _, fileID := range slices.Sorted(maps.Keys(sizeInfo)) {
+ _, err := tx.ExecContext(ctx, `UPDATE files SET info = $1 WHERE file_id = $2 and info is NULL`, sizeInfo[fileID], fileID)
if err != nil {
return stacktrace.Propagate(err, "")
}