chore: slightly optimise rename detection (ref #10777) (#10819)

Only run rename detection for new files. This skips an expensive check
for all updates to existing files. The tradeoff is that we no longer
immediately detect renames on top of another file as a rename -- this
may instead become a copy+delete operation on the destination.

---------

Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Jakob Borg
2026-07-25 07:46:56 +00:00
committed by GitHub
parent b15ff42d52
commit ec35a95318
4 changed files with 33 additions and 14 deletions
+10 -7
View File
@@ -3270,17 +3270,20 @@ func TestRenameSequenceOrder(t *testing.T) {
t.Errorf("Unexpected count: %d != %d", count, numFiles)
}
// Modify all the files, other than the ones we expect to rename
// Modify all the files other than the rename sources, whose content we
// keep intact so the renamed copies still match by block hash.
for i := 0; i < numFiles; i++ {
if i == 3 || i == 17 || i == 16 || i == 4 {
if i == 3 || i == 16 {
continue
}
v := fmt.Sprintf("%d", i)
writeFile(t, ffs, v, []byte(v+"-new"))
}
// Rename
must(t, ffs.Rename("3", "17"))
must(t, ffs.Rename("16", "4"))
// Rename to previously unseen names. Renaming onto an existing name is
// treated as an in-place update rather than a rename, since rename
// detection only runs for files that are new on disk.
must(t, ffs.Rename("3", "20"))
must(t, ffs.Rename("16", "21"))
// Scan
m.ScanFolders()
@@ -3291,10 +3294,10 @@ func TestRenameSequenceOrder(t *testing.T) {
it, errFn := m.LocalFilesSequenced("default", protocol.LocalDeviceID, 0)
for i := range it {
t.Log(i)
if i.FileName() == "17" {
if i.FileName() == "20" {
firstExpectedSequence = i.SequenceNo() + 1
}
if i.FileName() == "4" {
if i.FileName() == "21" {
secondExpectedSequence = i.SequenceNo() + 1
}
if i.FileName() == "3" {