perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/db: Consistent use of buffers (#5470)

Browse Source
This commit is contained in:
Simon Frei
2019-01-20 08:47:20 +01:00
committed by Jakob Borg
parent df4d754197
commit 00fa77dd47
3 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db/schemaupdater.go
View File

@@ -101,7 +101,7 @@ func (db *schemaUpdater) updateSchema0to1() {
changedFolders := make(map[string]struct{})
ignAdded := 0
meta := newMetadataTracker() // dummy metadata tracker
var gk []byte
var gk, buf []byte
for dbi.Next() {
folder, ok := db.keyer.FolderFromDeviceFileKey(dbi.Key())
@@ -126,7 +126,7 @@ func (db *schemaUpdater) updateSchema0to1() {
changedFolders[string(folder)] = struct{}{}
}
gk = db.keyer.GenerateGlobalVersionKey(gk, folder, name)
t.removeFromGlobal(gk, folder, device, nil, nil)
buf = t.removeFromGlobal(gk, buf, folder, device, nil, nil)
t.Delete(dbi.Key())
t.checkFlush()
continue
@@ -156,8 +156,8 @@ func (db *schemaUpdater) updateSchema0to1() {
// Add invalid files to global list
if f.IsInvalid() {
gk = db.keyer.GenerateGlobalVersionKey(gk, folder, name)
if t.updateGlobal(gk, folder, device, f, meta) {
if _, ok := changedFolders[string(folder)]; !ok {
if buf, ok = t.updateGlobal(gk, buf, folder, device, f, meta); ok {
if _, ok = changedFolders[string(folder)]; !ok {
changedFolders[string(folder)] = struct{}{}
}
ignAdded++