chore(db, model): separate methods to drop a device vs its files (#10480)

Fixes #10469

---------

Signed-off-by: Simon Frei <freisim93@gmail.com>
Signed-off-by: Jakob Borg <jakob@kastelo.net>
Co-authored-by: Marcus B Spencer <marcus@marcusspencer.us>
Co-authored-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Simon Frei
2026-06-04 18:28:19 +00:00
committed by GitHub
co-authored by Marcus B Spencer Jakob Borg
parent 6df85dc95c
commit e16b8013a6
6 changed files with 107 additions and 1 deletions
+82
View File
@@ -798,6 +798,13 @@ func TestDropAllFiles(t *testing.T) {
t.Fatal(err)
}
// The sequence is non-zero before the drop
if seq, err := db.GetDeviceSequence("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if seq == 0 {
t.Error("expected non-zero sequence before drop")
}
// Drop folder A
if err := db.DropAllFiles("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
@@ -825,6 +832,20 @@ func TestDropAllFiles(t *testing.T) {
t.Error("expected count to be two")
}
// The device sequence for the dropped folder is reset to zero.
if seq, err := db.GetDeviceSequence("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if seq != 0 {
t.Log(seq)
t.Error("expected sequence to be reset to zero after DropAllFiles")
}
// Sequence for the untouched folder is unaffected.
if seq, err := db.GetDeviceSequence("b", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if seq == 0 {
t.Error("expected non-zero sequence for untouched folder")
}
// Drop things that don't exist
if err := db.DropAllFiles("a", protocol.DeviceID{99}); err != nil {
t.Fatal(err)
@@ -837,6 +858,67 @@ func TestDropAllFiles(t *testing.T) {
}
}
func TestDropFolderDevice(t *testing.T) {
db, err := Open(t.TempDir())
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
if err := db.Close(); err != nil {
t.Fatal(err)
}
})
// Files from device 1 in folder a
err = db.Update("a", protocol.DeviceID{1}, []protocol.FileInfo{
genFile("test1", 1, 101),
genFile("test2", 2, 102),
})
if err != nil {
t.Fatal(err)
}
// Device 1 has an index ID.
if err := db.SetIndexID("a", protocol.DeviceID{1}, protocol.IndexID(0xdeadbeef)); err != nil {
t.Fatal(err)
}
if id, err := db.GetIndexID("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if id != protocol.IndexID(0xdeadbeef) {
t.Errorf("expected index ID to be set, got %v", id)
}
// Drop device 1 from folder a
if err := db.DropFolderDevice("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
}
// Files for device 1 in folder a are gone
if _, ok, err := db.GetDeviceFile("a", protocol.DeviceID{1}, "test1"); err != nil || ok {
t.Log(err, ok)
t.Error("expected device 1 file in folder A to not exist")
}
if c, err := db.CountLocal("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if c.Files != 0 {
t.Log(c)
t.Error("expected device 1 count in folder A to be zero")
}
// The index ID for device 1 in folder A is gone.
if id, err := db.GetIndexID("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if id != 0 {
t.Errorf("expected index ID to be cleared, got %v", id)
}
if seq, err := db.GetDeviceSequence("a", protocol.DeviceID{1}); err != nil {
t.Fatal(err)
} else if seq != 0 {
t.Log(seq)
t.Error("expected sequence to be zero after DropFolderDevice")
}
}
func TestConcurrentUpdate(t *testing.T) {
t.Parallel()