lib/db: Fix some omitted error checks, unused variable (#7489)
This commit is contained in:
@@ -262,6 +262,9 @@ func TestUpdate0to3(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
key, err = trans.keyer.GenerateDeviceFileKey(key, folder, vl.Versions[0].Device, name)
|
key, err = trans.keyer.GenerateDeviceFileKey(key, folder, vl.Versions[0].Device, name)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
fi, ok, err := trans.getFileTrunc(key, false)
|
fi, ok, err := trans.getFileTrunc(key, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|||||||
@@ -932,6 +932,9 @@ func (db *Lowlevel) recalcMeta(folderStr string) (*metadataTracker, error) {
|
|||||||
meta.addFile(protocol.GlobalDeviceID, f)
|
meta.addFile(protocol.GlobalDeviceID, f)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
meta.emptyNeeded(protocol.LocalDeviceID)
|
meta.emptyNeeded(protocol.LocalDeviceID)
|
||||||
err = t.withNeed(folder, protocol.LocalDeviceID[:], true, func(f protocol.FileIntf) bool {
|
err = t.withNeed(folder, protocol.LocalDeviceID[:], true, func(f protocol.FileIntf) bool {
|
||||||
|
|||||||
+2
-3
@@ -148,10 +148,9 @@ func (m *metadataTracker) countsPtr(dev protocol.DeviceID, flag uint32) *Counts
|
|||||||
// the metadatatracker, even if there's no change to the need
|
// the metadatatracker, even if there's no change to the need
|
||||||
// bucket itself.
|
// bucket itself.
|
||||||
nkey := metaKey{dev, needFlag}
|
nkey := metaKey{dev, needFlag}
|
||||||
nidx, ok := m.indexes[nkey]
|
if _, ok := m.indexes[nkey]; !ok {
|
||||||
if !ok {
|
|
||||||
// Initially a new device needs everything, except deletes
|
// Initially a new device needs everything, except deletes
|
||||||
nidx = len(m.counts.Counts)
|
nidx := len(m.counts.Counts)
|
||||||
m.counts.Counts = append(m.counts.Counts, m.allNeededCounts(dev))
|
m.counts.Counts = append(m.counts.Counts, m.allNeededCounts(dev))
|
||||||
m.indexes[nkey] = nidx
|
m.indexes[nkey] = nidx
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -730,6 +730,9 @@ func (db *schemaUpdater) updateSchemaTo14(_ int) error {
|
|||||||
defer t.close()
|
defer t.close()
|
||||||
|
|
||||||
key, err = t.keyer.GenerateDeviceFileKey(key, folder, protocol.LocalDeviceID[:], nil)
|
key, err = t.keyer.GenerateDeviceFileKey(key, folder, protocol.LocalDeviceID[:], nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
it, err := t.NewPrefixIterator(key)
|
it, err := t.NewPrefixIterator(key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user