π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Stamp collection changes after file locking
Neeraj Gupta38cb70df4597
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.goindex daeeb3c610..a1edcaca1f 100644--- a/server/pkg/repo/collection.go+++ b/server/pkg/repo/collection.go@@ -680,7 +680,6 @@ func (repo *CollectionRepository) AddFiles(files []ente.CollectionFileItem,fileOwnerID int64,) error {- updationTime := time.Microseconds()tx, err := repo.DB.BeginTx(ctx, nil)if err != nil {return stacktrace.Propagate(err, "")@@ -694,6 +693,7 @@ func (repo *CollectionRepository) AddFiles(if err := lockFiles(ctx, tx, fileOwnerID, fileIDs); err != nil {return stacktrace.Propagate(err, "")}+ updationTime := time.Microseconds()trashedOrDeletedFileIDs, err := repo.TrashRepo.getFilesInTrashOrDeleted(ctx, tx, fileOwnerID, fileIDs)if err != nil {return stacktrace.Propagate(err, "failed to check trash state")diff --git a/server/pkg/repo/collection_memberships_test.go b/server/pkg/repo/collection_memberships_test.goindex d79c9d5ced..9f956c70ca 100644--- a/server/pkg/repo/collection_memberships_test.go+++ b/server/pkg/repo/collection_memberships_test.go@@ -241,6 +241,7 @@ func TestAddFilesAndTrashFilesSerializeOnFile(t *testing.T) {}()waitForFileLockWaiters(t, db)+ lockReleaseTime := time.Now().UnixMicro()if err := blocker.Commit(); err != nil {t.Fatal(err)}@@ -263,6 +264,9 @@ func TestAddFilesAndTrashFilesSerializeOnFile(t *testing.T) {if activeMemberships != 0 || activeTrashRows != 1 {t.Fatalf("final state = (%d active memberships, %d active Trash rows), want (0, 1)", activeMemberships, activeTrashRows)}+ if updationTime := readCollectionMembershipState(t, db, sourceCollectionID, fileID).updationTime; updationTime < lockReleaseTime {+ t.Fatalf("membership updation_time = %d, want >= %d", updationTime, lockReleaseTime)+ }}func TestRestoreFilesUpsertsBatchAndMarksTrashRestored(t *testing.T) {diff --git a/server/pkg/repo/trash.go b/server/pkg/repo/trash.goindex 28ce911898..e720766b80 100644--- a/server/pkg/repo/trash.go+++ b/server/pkg/repo/trash.go@@ -119,7 +119,6 @@ func (t *TrashRepository) TrashFiles(ctx context.Context, userID int64, trash enfor _, item := range trash.TrashItems {fileIDs = append(fileIDs, item.FileID)}- updationTime := time.Microseconds()tx, err := t.DB.BeginTx(ctx, nil)if err != nil {return stacktrace.Propagate(err, "")@@ -128,6 +127,7 @@ func (t *TrashRepository) TrashFiles(ctx context.Context, userID int64, trash enif err := lockFiles(ctx, tx, userID, fileIDs); err != nil {return stacktrace.Propagate(err, "")}+ updationTime := time.Microseconds()rows, err := tx.QueryContext(ctx, `SELECT DISTINCT collection_id FROMcollection_files WHERE file_id = ANY($1) AND is_deleted = $2`, pq.Array(fileIDs), false)if err != nil {