badger: get rid of panics.

This commit is contained in:
fiatjaf
2023-11-07 15:37:32 -03:00
parent 02ba8f3cfe
commit cc8695a3cc
3 changed files with 18 additions and 15 deletions

View File

@@ -3,6 +3,7 @@ package badger
import ( import (
"context" "context"
"encoding/binary" "encoding/binary"
"log"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
"github.com/nbd-wtf/go-nostr" "github.com/nbd-wtf/go-nostr"
@@ -43,19 +44,19 @@ func (b BadgerBackend) CountEvents(ctx context.Context, filter nostr.Filter) (in
idx[0] = rawEventStorePrefix idx[0] = rawEventStorePrefix
copy(idx[1:], key[idxOffset:]) copy(idx[1:], key[idxOffset:])
// fetch actual event
item, err := txn.Get(idx)
if err != nil {
if err == badger.ErrDiscardedTxn {
return err
}
panic(err)
}
if extraFilter == nil { if extraFilter == nil {
count++ count++
} else { } else {
// fetch actual event
item, err := txn.Get(idx)
if err != nil {
if err == badger.ErrDiscardedTxn {
return err
}
log.Printf("badger: count (%v) failed to get %d from raw event store: %s\n", q, idx, err)
return err
}
err = item.Value(func(val []byte) error { err = item.Value(func(val []byte) error {
evt := &nostr.Event{} evt := &nostr.Event{}
if err := nostr_binary.Unmarshal(val, evt); err != nil { if err := nostr_binary.Unmarshal(val, evt); err != nil {
@@ -70,7 +71,7 @@ func (b BadgerBackend) CountEvents(ctx context.Context, filter nostr.Filter) (in
return nil return nil
}) })
if err != nil { if err != nil {
panic(err) log.Printf("badger: count value read error: %s\n", err)
} }
} }
} }

View File

@@ -6,6 +6,7 @@ import (
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"log"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
"github.com/nbd-wtf/go-nostr" "github.com/nbd-wtf/go-nostr"
@@ -70,7 +71,8 @@ func (b BadgerBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (ch
if err == badger.ErrDiscardedTxn { if err == badger.ErrDiscardedTxn {
return return
} }
panic(err) log.Printf("badger: (%v) failed to get %d from raw event store: %s\n", q, idx, err)
return
} }
err = item.Value(func(val []byte) error { err = item.Value(func(val []byte) error {
evt := &nostr.Event{} evt := &nostr.Event{}
@@ -86,7 +88,7 @@ func (b BadgerBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (ch
return nil return nil
}) })
if err != nil { if err != nil {
panic(err) log.Printf("badger: value read error: %s\n", err)
} }
} }
}(i, q) }(i, q)
@@ -155,7 +157,7 @@ func (b BadgerBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (ch
return nil return nil
}) })
if err != nil { if err != nil {
panic(err) log.Printf("badger: query txn error: %s\n", err)
} }
}() }()

View File

@@ -92,7 +92,7 @@ func (b *LMDBBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (cha
} }
evt := &nostr.Event{} evt := &nostr.Event{}
if err := nostr_binary.Unmarshal(val, evt); err != nil { if err := nostr_binary.Unmarshal(val, evt); err == nil {
panic(err) panic(err)
} }