felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/db: Fix accounting bug when dropping indexes (#7774)

Browse Source
This commit is contained in:
Simon Frei
2021-06-17 10:15:11 +02:00
committed by GitHub
parent aa6c55dec1
commit 23a0e18292
4 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/structs.go
+4 -7
View File
@@ -331,15 +331,12 @@ func (vl *VersionList) pop(device, name []byte) (FileVersion, bool, bool, error)
oldFV := vl.RawVersions[i].copy()
if invDevice {
vl.RawVersions[i].InvalidDevices = popDeviceAt(vl.RawVersions[i].InvalidDevices, j)
} else {
vl.RawVersions[i].Devices = popDeviceAt(vl.RawVersions[i].Devices, j)
return oldFV, true, false, nil
}
vl.RawVersions[i].Devices = popDeviceAt(vl.RawVersions[i].Devices, j)
// If the last valid device of the previous global was removed above,
// the next entry is now the global entry (unless all entries are invalid).
if len(vl.RawVersions[i].Devices) == 0 && globalPos == i {
return oldFV, true, globalPos == vl.findGlobal(), nil
}
return oldFV, true, false, nil
// the global changed.
return oldFV, true, len(vl.RawVersions[i].Devices) == 0 && globalPos == i, nil
}
// Get returns a FileVersion that contains the given device and whether it has