vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2026-05-01 21:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tests and linter warnings

Browse source
This commit is contained in:
Daniel 2022-02-01 13:12:46 +01:00
parent 7d2cd6c15d
commit f59ad0357a
162 changed files with 668 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ func NewBadger(name, location string) (storage.Interface, error) {
opts := badger.DefaultOptions(location)
db, err := badger.Open(opts)
if err == badger.ErrTruncateNeeded {
if errors.Is(err, badger.ErrTruncateNeeded) {
// clean up after crash
log.Warningf("database/storage: truncating corrupted value log of badger database %s: this may cause data loss", name)
opts.Truncate = true
@ -54,7 +54,7 @@ func (b *Badger) Get(key string) (record.Record, error) {
var err error
item, err = txn.Get([]byte(key))
if err != nil {
if err == badger.ErrKeyNotFound {
if errors.Is(err, badger.ErrKeyNotFound) {
return storage.ErrNotFound
}
return err
@ -114,7 +114,7 @@ func (b *Badger) Put(r record.Record) (record.Record, error) {
func (b *Badger) Delete(key string) error {
return b.db.Update(func(txn *badger.Txn) error {
err := txn.Delete([]byte(key))
if err != nil && err != badger.ErrKeyNotFound {
if err != nil && !errors.Is(err, badger.ErrKeyNotFound) {
return err
}
return nil
@ -125,7 +125,7 @@ func (b *Badger) Delete(key string) error {
func (b *Badger) Query(q *query.Query, local, internal bool) (*iterator.Iterator, error) {
_, err := q.Check()
if err != nil {
return nil, fmt.Errorf("invalid query: %s", err)
return nil, fmt.Errorf("invalid query: %w", err)
}
queryIter := iterator.New()
@ -169,17 +169,17 @@ func (b *Badger) queryExecutor(queryIter *iterator.Iterator, q *query.Query, loc
if err != nil {
return err
}
new, err := record.NewRawWrapper(b.name, r.DatabaseKey(), copiedData)
newWrapper, err := record.NewRawWrapper(b.name, r.DatabaseKey(), copiedData)
if err != nil {
return err
}
select {
case <-queryIter.Done:
return nil
case queryIter.Next <- new:
case queryIter.Next <- newWrapper:
default:
select {
case queryIter.Next <- new:
case queryIter.Next <- newWrapper:
case <-queryIter.Done:
return nil
case <-time.After(1 * time.Minute):