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

lib/db,cmd/stindex: Expose VersionList and use it in stindex

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3231
This commit is contained in:
Audrius Butkevicius
2016-05-31 19:29:26 +00:00
committed by Jakob Borg
parent 1612baca92
commit 6f63909c65
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/db/leveldb_dbinstance.go
View File

@@ -339,7 +339,7 @@ func (db *Instance) getGlobal(folder, file []byte, truncate bool) (FileIntf, boo
panic(err)
}
var vl versionList
var vl VersionList
err = vl.UnmarshalXDR(bs)
if err != nil {
panic(err)
@@ -376,7 +376,7 @@ func (db *Instance) withGlobal(folder, prefix []byte, truncate bool, fn Iterator
var fk []byte
for dbi.Next() {
var vl versionList
var vl VersionList
err := vl.UnmarshalXDR(dbi.Value())
if err != nil {
panic(err)
@@ -428,7 +428,7 @@ func (db *Instance) availability(folder, file []byte) []protocol.DeviceID {
panic(err)
}
var vl versionList
var vl VersionList
err = vl.UnmarshalXDR(bs)
if err != nil {
panic(err)
@@ -456,7 +456,7 @@ func (db *Instance) withNeed(folder, device []byte, truncate bool, fn Iterator)
var fk []byte
nextFile:
for dbi.Next() {
var vl versionList
var vl VersionList
err := vl.UnmarshalXDR(dbi.Value())
if err != nil {
panic(err)
@@ -593,7 +593,7 @@ func (db *Instance) checkGlobals(folder []byte, globalSize *sizeTracker) {
var fk []byte
for dbi.Next() {
gk := dbi.Key()
var vl versionList
var vl VersionList
err := vl.UnmarshalXDR(dbi.Value())
if err != nil {
panic(err)
@@ -605,7 +605,7 @@ func (db *Instance) checkGlobals(folder []byte, globalSize *sizeTracker) {
// we find those and clear them out.
name := db.globalKeyName(gk)
var newVL versionList
var newVL VersionList
for i, version := range vl.versions {
fk = db.deviceKeyInto(fk[:cap(fk)], folder, version.device, name)