Skip to content

armgit / ente

Public Imported from GitHub
0

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

Require existing usage rows for updates

Neeraj Gupta89a3d948bbd3
diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.go
index 90ffc7ec11..f7304546b5 100644
--- a/server/pkg/repo/file.go
+++ b/server/pkg/repo/file.go
@@ -796,17 +796,18 @@ func (repo *FileRepository) updateUsage(ctx context.Context, tx *sql.Tx, userID,
fileCountSourceVersionDiff = 1
}
var usage int64
- err := tx.QueryRowContext(ctx, `INSERT INTO usage
- (user_id, storage_consumed, file_count_source_version)
- VALUES ($1, $2, $5)
- ON CONFLICT (user_id) DO UPDATE SET
- storage_consumed = usage.storage_consumed + EXCLUDED.storage_consumed,
- photos_file_count = usage.photos_file_count + $3,
- locker_file_count = usage.locker_file_count + $4,
- file_count_source_version = usage.file_count_source_version + EXCLUDED.file_count_source_version
+ err := tx.QueryRowContext(ctx, `UPDATE usage SET
+ storage_consumed = storage_consumed + $2,
+ photos_file_count = photos_file_count + $3,
+ locker_file_count = locker_file_count + $4,
+ file_count_source_version = file_count_source_version + $5
+ WHERE user_id = $1
RETURNING storage_consumed`,
userID, storageDiff, photosFileCountDiff, lockerFileCountDiff, fileCountSourceVersionDiff).Scan(&usage)
if err != nil {
+ if errors.Is(err, sql.ErrNoRows) {
+ return -1, stacktrace.Propagate(err, "missing usage row for user %d", userID)
+ }
return -1, stacktrace.Propagate(err, "")
}
return usage, nil
diff --git a/server/pkg/repo/file_usage_test.go b/server/pkg/repo/file_usage_test.go
index 0bb06f2352..52a8fd2fc3 100644
--- a/server/pkg/repo/file_usage_test.go
+++ b/server/pkg/repo/file_usage_test.go
@@ -12,14 +12,12 @@ func TestUpdateUsageForFileCreationMaintainsCounterState(t *testing.T) {
db := setupFileUsageTest(t)
repo := &FileRepository{DB: db}
tests := []struct {
- name string
- app ente.App
- usageExists bool
- ready bool
+ name string
+ app ente.App
+ ready bool
}{
- {name: "ready_photos", app: ente.Photos, usageExists: true, ready: true},
- {name: "legacy_photos", app: ente.Photos, usageExists: true},
- {name: "missing_locker", app: ente.Locker},
+ {name: "ready_photos", app: ente.Photos, ready: true},
+ {name: "legacy_photos", app: ente.Photos},
}
for i, tt := range tests {
@@ -35,7 +33,7 @@ func TestUpdateUsageForFileCreationMaintainsCounterState(t *testing.T) {
VALUES ($1, 10, 2, 3, 7)`, userID); err != nil {
t.Fatal(err)
}
- } else if tt.usageExists {
+ } else {
testutil.InsertUsage(t, db, userID, 10)
}
@@ -58,9 +56,6 @@ func TestUpdateUsageForFileCreationMaintainsCounterState(t *testing.T) {
t.Fatal(err)
}
wantStorage := int64(15)
- if !tt.usageExists {
- wantStorage = 5
- }
if usage != wantStorage || storage != wantStorage {
t.Fatalf("storage = (%d, %d), want %d", usage, storage, wantStorage)
}
@@ -75,6 +70,32 @@ func TestUpdateUsageForFileCreationMaintainsCounterState(t *testing.T) {
}
}
+func TestUpdateUsageRequiresUsageRow(t *testing.T) {
+ db := setupFileUsageTest(t)
+ userID := testutil.InsertUser(t, db, testutil.UserFixture{
+ UserID: 1,
+ Email: "[email protected]",
+ CreationTime: 1,
+ })
+ tx, err := db.BeginTx(t.Context(), nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer tx.Rollback()
+
+ if _, err := (&FileRepository{}).updateUsage(t.Context(), tx, userID, 5, 1, 0); err == nil {
+ t.Fatal("updateUsage() created a missing usage row")
+ }
+
+ var count int
+ if err := db.QueryRow(`SELECT COUNT(*) FROM usage WHERE user_id = $1`, userID).Scan(&count); err != nil {
+ t.Fatal(err)
+ }
+ if count != 0 {
+ t.Fatalf("usage row count = %d, want 0", count)
+ }
+}
+
func TestCreateMetaFileUpdatesReadyLockerCount(t *testing.T) {
db := setupFileUsageTest(t)
userID := testutil.InsertUser(t, db, testutil.UserFixture{