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

lib/db: Remove *instance by making everything *Lowlevel (#6204)

Browse Source
This commit is contained in:
Simon Frei
2019-12-02 08:18:04 +01:00
committed by Jakob Borg
parent e82a7e3dfa
commit 0bec01b827
11 changed files with 851 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db/blockmap_test.go
View File

@@ -36,14 +36,14 @@ func init() {
}
}
func setup() (*instance, *BlockFinder) {
func setup() (*Lowlevel, *BlockFinder) {
// Setup
db := NewLowlevel(backend.OpenMemory())
return newInstance(db), NewBlockFinder(db)
return db, NewBlockFinder(db)
}
func dbEmpty(db *instance) bool {
func dbEmpty(db *Lowlevel) bool {
iter, err := db.NewPrefixIterator([]byte{KeyTypeBlock})
if err != nil {
panic(err)
@@ -52,7 +52,7 @@ func dbEmpty(db *instance) bool {
return !iter.Next()
}
func addToBlockMap(db *instance, folder []byte, fs []protocol.FileInfo) error {
func addToBlockMap(db *Lowlevel, folder []byte, fs []protocol.FileInfo) error {
t, err := db.newReadWriteTransaction()
if err != nil {
return err
@@ -79,7 +79,7 @@ func addToBlockMap(db *instance, folder []byte, fs []protocol.FileInfo) error {
return t.commit()
}
func discardFromBlockMap(db *instance, folder []byte, fs []protocol.FileInfo) error {
func discardFromBlockMap(db *Lowlevel, folder []byte, fs []protocol.FileInfo) error {
t, err := db.newReadWriteTransaction()
if err != nil {
return err