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

Forced DB GC:s should be done before creating a lot of garbage, not after

Browse Source
This commit is contained in:
Jakob Borg 2014-09-18 10:04:37 +02:00
parent c07b39e58b
commit 97844603fc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/leveldb.go
View File

@ -132,7 +132,7 @@ type deletionHandler func(db dbReader, batch dbWriter, repo, node, name []byte,
type fileIterator func(f protocol.FileIntf) bool type fileIterator func(f protocol.FileIntf) bool
func ldbGenericReplace(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo, deleteFn deletionHandler) uint64 { func ldbGenericReplace(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo, deleteFn deletionHandler) uint64 {
defer runtime.GC() runtime.GC()
sort.Sort(fileList(fs)) // sort list on name, same as on disk sort.Sort(fileList(fs)) // sort list on name, same as on disk
@ -272,7 +272,7 @@ func ldbReplaceWithDelete(db *leveldb.DB, repo, node []byte, fs []protocol.FileI
} }
func ldbUpdate(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo) uint64 { func ldbUpdate(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo) uint64 {
defer runtime.GC() runtime.GC()
batch := new(leveldb.Batch) batch := new(leveldb.Batch)
snap, err := db.GetSnapshot() snap, err := db.GetSnapshot()
@ -453,7 +453,7 @@ func ldbWithHave(db *leveldb.DB, repo, node []byte, truncate bool, fn fileIterat
} }
func ldbWithAllRepoTruncated(db *leveldb.DB, repo []byte, fn func(node []byte, f protocol.FileInfoTruncated) bool) { func ldbWithAllRepoTruncated(db *leveldb.DB, repo []byte, fn func(node []byte, f protocol.FileInfoTruncated) bool) {
defer runtime.GC() runtime.GC()
start := nodeKey(repo, nil, nil) // before all repo/node files start := nodeKey(repo, nil, nil) // before all repo/node files
limit := nodeKey(repo, protocol.LocalNodeID[:], []byte{0xff, 0xff, 0xff, 0xff}) // after all repo/node files limit := nodeKey(repo, protocol.LocalNodeID[:], []byte{0xff, 0xff, 0xff, 0xff}) // after all repo/node files
@ -537,7 +537,7 @@ func ldbGetGlobal(db *leveldb.DB, repo, file []byte) protocol.FileInfo {
} }
func ldbWithGlobal(db *leveldb.DB, repo []byte, truncate bool, fn fileIterator) { func ldbWithGlobal(db *leveldb.DB, repo []byte, truncate bool, fn fileIterator) {
defer runtime.GC() runtime.GC()
start := globalKey(repo, nil) start := globalKey(repo, nil)
limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff}) limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff})
@ -605,7 +605,7 @@ func ldbAvailability(db *leveldb.DB, repo, file []byte) []protocol.NodeID {
} }
func ldbWithNeed(db *leveldb.DB, repo, node []byte, truncate bool, fn fileIterator) { func ldbWithNeed(db *leveldb.DB, repo, node []byte, truncate bool, fn fileIterator) {
defer runtime.GC() runtime.GC()
start := globalKey(repo, nil) start := globalKey(repo, nil)
limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff}) limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff})
@ -687,7 +687,7 @@ outer:
} }
func ldbListRepos(db *leveldb.DB) []string { func ldbListRepos(db *leveldb.DB) []string {
defer runtime.GC() runtime.GC()
start := []byte{keyTypeGlobal} start := []byte{keyTypeGlobal}
limit := []byte{keyTypeGlobal + 1} limit := []byte{keyTypeGlobal + 1}
@ -717,7 +717,7 @@ func ldbListRepos(db *leveldb.DB) []string {
} }
func ldbDropRepo(db *leveldb.DB, repo []byte) { func ldbDropRepo(db *leveldb.DB, repo []byte) {
defer runtime.GC() runtime.GC()
snap, err := db.GetSnapshot() snap, err := db.GetSnapshot()
if err != nil { if err != nil {