Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update to badger v3, and use badger as default in memory store #56

Merged
merged 6 commits into from
Nov 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/defradb/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package cmd

import (
badgerds "github.com/ipfs/go-ds-badger"
badgerds "github.com/sourcenetwork/defradb/datastores/badger/v3"
)

type Config struct {
Expand Down
15 changes: 9 additions & 6 deletions cli/defradb/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import (

"github.com/sourcenetwork/defradb/db"

badger "github.com/dgraph-io/badger/v3"
ds "github.com/ipfs/go-datastore"
badgerds "github.com/ipfs/go-ds-badger"
badgerds "github.com/sourcenetwork/defradb/datastores/badger/v3"
"github.com/spf13/cobra"
)

Expand All @@ -41,16 +42,18 @@ var startCmd = &cobra.Command{
log.Info("opening badger store: ", config.Database.Badger.Path)
rootstore, err = badgerds.NewDatastore(config.Database.Badger.Path, config.Database.Badger.Options)
options = config.Database.Badger
if err != nil {
log.Error("Failed to initiate database:", err)
os.Exit(1)
}
} else if config.Database.Store == "memory" {
log.Info("building new memory store")
rootstore = ds.NewMapDatastore()
opts := badgerds.Options{Options: badger.DefaultOptions("").WithInMemory(true)}
rootstore, err = badgerds.NewDatastore("", &opts)
options = config.Database.Memory
}

if err != nil {
log.Error("Failed to initiate datastore:", err)
os.Exit(1)
}

db, err := db.NewDB(rootstore, options)
if err != nil {
log.Error("Failed to initiate database:", err)
Expand Down
22 changes: 22 additions & 0 deletions datastores/badger/v3/compat_logger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Code copy-pasted from https://github.com/ipfs/go-ds-badger2/blob/master/compat_logger.go

package badger

import "go.uber.org/zap"

type compatLogger struct {
zap.SugaredLogger
skipLogger zap.SugaredLogger
}

// Warning is for compatibility
// Deprecated: use Warn(args ...interface{}) instead
func (logger *compatLogger) Warning(args ...interface{}) {
logger.skipLogger.Warn(args...)
}

// Warningf is for compatibility
// Deprecated: use Warnf(format string, args ...interface{}) instead
func (logger *compatLogger) Warningf(format string, args ...interface{}) {
logger.skipLogger.Warnf(format, args...)
}
Loading