vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-02 02:29:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up storage backends

Browse source
This commit is contained in:
Daniel 2019-09-20 22:01:33 +02:00
parent 60dea8092f
commit ddc773a9f2
6 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
database/storage/badger/badger.go
View file

@ -21,7 +21,7 @@ type Badger struct {
} }
func init() { func init() {
storage.Register("badger", NewBadger) _ = storage.Register("badger", NewBadger)
} }
// NewBadger opens/creates a badger database. // NewBadger opens/creates a badger database.
@ -190,7 +190,7 @@ func (b *Badger) Injected() bool {
// Maintain runs a light maintenance operation on the database. // Maintain runs a light maintenance operation on the database.
func (b *Badger) Maintain() error { func (b *Badger) Maintain() error {
b.db.RunValueLogGC(0.7) _ = b.db.RunValueLogGC(0.7)
return nil return nil
} }

9
database/storage/badger/badger_test.go
View file

@ -1,3 +1,4 @@
//nolint:unparam,maligned
package badger package badger
import ( import (
@ -13,7 +14,7 @@ import (
type TestRecord struct { type TestRecord struct {
record.Base record.Base
lock sync.Mutex sync.Mutex
S string S string
I int I int
I8 int8 I8 int8
@ -30,12 +31,6 @@ type TestRecord struct {
B bool B bool
} }
func (tr *TestRecord) Lock() {
}
func (tr *TestRecord) Unlock() {
}
func TestBadger(t *testing.T) { func TestBadger(t *testing.T) {
testDir, err := ioutil.TempDir("", "testing-") testDir, err := ioutil.TempDir("", "testing-")
if err != nil { if err != nil {

2
database/storage/bbolt/bbolt.go
View file

@ -26,7 +26,7 @@ type BBolt struct {
} }
func init() { func init() {
storage.Register("bbolt", NewBBolt) _ = storage.Register("bbolt", NewBBolt)
} }
// NewBBolt opens/creates a bbolt database. // NewBBolt opens/creates a bbolt database.

9
database/storage/bbolt/bbolt_test.go
View file

@ -1,3 +1,4 @@
//nolint:unparam,maligned
package bbolt package bbolt
import ( import (
@ -13,7 +14,7 @@ import (
type TestRecord struct { type TestRecord struct {
record.Base record.Base
lock sync.Mutex sync.Mutex
S string S string
I int I int
I8 int8 I8 int8
@ -30,12 +31,6 @@ type TestRecord struct {
B bool B bool
} }
func (tr *TestRecord) Lock() {
}
func (tr *TestRecord) Unlock() {
}
func TestBadger(t *testing.T) { func TestBadger(t *testing.T) {
testDir, err := ioutil.TempDir("", "testing-") testDir, err := ioutil.TempDir("", "testing-")
if err != nil { if err != nil {

19
database/storage/fstree/fstree.go
View file

@ -35,7 +35,7 @@ type FSTree struct {
} }
func init() { func init() {
storage.Register("fstree", NewFSTree) _ = storage.Register("fstree", NewFSTree)
} }
// NewFSTree returns a (new) FSTree database. // NewFSTree returns a (new) FSTree database.
@ -160,15 +160,14 @@ func (fst *FSTree) Query(q *query.Query, local, internal bool) (*iterator.Iterat
} }
fileInfo, err := os.Stat(walkPrefix) fileInfo, err := os.Stat(walkPrefix)
var walkRoot string var walkRoot string
if err == nil { switch {
if fileInfo.IsDir() { case err == nil && fileInfo.IsDir():
walkRoot = walkPrefix walkRoot = walkPrefix
} else { case err == nil:
walkRoot = filepath.Dir(walkPrefix)
}
} else if os.IsNotExist(err) {
walkRoot = filepath.Dir(walkPrefix) walkRoot = filepath.Dir(walkPrefix)
} else { case os.IsNotExist(err):
walkRoot = filepath.Dir(walkPrefix)
default: // err != nil
return nil, fmt.Errorf("fstree: could not stat query root %s: %s", walkPrefix, err) return nil, fmt.Errorf("fstree: could not stat query root %s: %s", walkPrefix, err)
} }
@ -279,7 +278,7 @@ func writeFile(filename string, data []byte, perm os.FileMode) error {
if err != nil { if err != nil {
return err return err
} }
defer t.Cleanup() defer t.Cleanup() //nolint:errcheck
// Set permissions before writing data, in case the data is sensitive. // Set permissions before writing data, in case the data is sensitive.
if !onWindows { if !onWindows {

2
database/storage/sinkhole/sinkhole.go
View file

@ -15,7 +15,7 @@ type Sinkhole struct {
} }
func init() { func init() {
storage.Register("sinkhole", NewSinkhole) _ = storage.Register("sinkhole", NewSinkhole)
} }
// NewSinkhole creates a dummy database. // NewSinkhole creates a dummy database.