lib/db: Constant/unused args and return values, double it.Release (#8259)

This commit is contained in:
greatroar
2022-04-27 20:32:44 +02:00
committed by GitHub
parent 49488c0e71
commit d00a30069a
3 changed files with 14 additions and 22 deletions
+5 -8
View File
@@ -841,6 +841,7 @@ func rewriteGlobals(t readWriteTransaction) error {
return err
}
defer it.Release()
for it.Next() {
var vl VersionListDeprecated
if err := vl.Unmarshal(it.Value()); err != nil {
@@ -858,10 +859,7 @@ func rewriteGlobals(t readWriteTransaction) error {
}
}
newVl, err := convertVersionList(vl)
if err != nil {
return err
}
newVl := convertVersionList(vl)
if err := t.Put(it.Key(), mustMarshal(&newVl)); err != nil {
return err
}
@@ -869,11 +867,10 @@ func rewriteGlobals(t readWriteTransaction) error {
return err
}
}
it.Release()
return it.Error()
}
func convertVersionList(vl VersionListDeprecated) (VersionList, error) {
func convertVersionList(vl VersionListDeprecated) VersionList {
var newVl VersionList
var newPos, oldPos int
var lastVersion protocol.Vector
@@ -893,7 +890,7 @@ func convertVersionList(vl VersionListDeprecated) (VersionList, error) {
}
if oldPos == len(vl.Versions) {
return newVl, nil
return newVl
}
if len(newVl.RawVersions) == 0 {
@@ -923,7 +920,7 @@ outer:
newPos++
}
return newVl, nil
return newVl
}
func getGlobalVersionsByKeyBefore11(key []byte, t readOnlyTransaction) (VersionListDeprecated, error) {