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

Add log #624

Merged
merged 3 commits into from
Dec 1, 2023
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
13 changes: 13 additions & 0 deletions db.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ type DB struct {
// Supported only on Unix via mlock/munlock syscalls.
Mlock bool

// Logger is the logger used for bbolt.
Logger Logger

path string
openFile func(string, int, os.FileMode) (*os.File, error)
file *os.File
Expand Down Expand Up @@ -194,6 +197,12 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
db.MaxBatchDelay = common.DefaultMaxBatchDelay
db.AllocSize = common.DefaultAllocSize

if options.Logger == nil {
db.Logger = getDiscardLogger()
} else {
db.Logger = options.Logger
}

flag := os.O_RDWR
if options.ReadOnly {
flag = os.O_RDONLY
Expand Down Expand Up @@ -293,6 +302,7 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
}

// Mark the database as opened and return.
db.Logger.Debug("bbolt opened successfully")
return db, nil
}

Expand Down Expand Up @@ -1268,6 +1278,9 @@ type Options struct {
// It prevents potential page faults, however
// used memory can't be reclaimed. (UNIX only)
Mlock bool

// Logger is the logger used for bbolt.
Logger Logger
}

// DefaultOptions represent the options used if nil options are passed into Open().
Expand Down
113 changes: 113 additions & 0 deletions logger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
package bbolt

// See https://github.com/etcd-io/raft/blob/main/logger.go
import (
"fmt"
"io"
"log"
"os"
)

type Logger interface {
Debug(v ...interface{})
Debugf(format string, v ...interface{})

Error(v ...interface{})
Errorf(format string, v ...interface{})

Info(v ...interface{})
Infof(format string, v ...interface{})

Warning(v ...interface{})
Warningf(format string, v ...interface{})

Fatal(v ...interface{})
Fatalf(format string, v ...interface{})

Panic(v ...interface{})
Panicf(format string, v ...interface{})
}

func getDiscardLogger() Logger {
return discardLogger
}

var (
discardLogger = &DefaultLogger{Logger: log.New(io.Discard, "", 0)}
)

const (
calldepth = 2
)

// DefaultLogger is a default implementation of the Logger interface.
type DefaultLogger struct {
*log.Logger
debug bool
}

func (l *DefaultLogger) EnableTimestamps() {
l.SetFlags(l.Flags() | log.Ldate | log.Ltime)
}

func (l *DefaultLogger) EnableDebug() {
l.debug = true
}

func (l *DefaultLogger) Debug(v ...interface{}) {
if l.debug {
_ = l.Output(calldepth, header("DEBUG", fmt.Sprint(v...)))
}
}

func (l *DefaultLogger) Debugf(format string, v ...interface{}) {
if l.debug {
_ = l.Output(calldepth, header("DEBUG", fmt.Sprintf(format, v...)))
}
}

func (l *DefaultLogger) Info(v ...interface{}) {
_ = l.Output(calldepth, header("INFO", fmt.Sprint(v...)))
}

func (l *DefaultLogger) Infof(format string, v ...interface{}) {
_ = l.Output(calldepth, header("INFO", fmt.Sprintf(format, v...)))
}

func (l *DefaultLogger) Error(v ...interface{}) {
_ = l.Output(calldepth, header("ERROR", fmt.Sprint(v...)))
}

func (l *DefaultLogger) Errorf(format string, v ...interface{}) {
_ = l.Output(calldepth, header("ERROR", fmt.Sprintf(format, v...)))
}

func (l *DefaultLogger) Warning(v ...interface{}) {
_ = l.Output(calldepth, header("WARN", fmt.Sprint(v...)))
}

func (l *DefaultLogger) Warningf(format string, v ...interface{}) {
_ = l.Output(calldepth, header("WARN", fmt.Sprintf(format, v...)))
}

func (l *DefaultLogger) Fatal(v ...interface{}) {
_ = l.Output(calldepth, header("FATAL", fmt.Sprint(v...)))
os.Exit(1)
}

func (l *DefaultLogger) Fatalf(format string, v ...interface{}) {
_ = l.Output(calldepth, header("FATAL", fmt.Sprintf(format, v...)))
os.Exit(1)
}

func (l *DefaultLogger) Panic(v ...interface{}) {
l.Logger.Panic(v...)
}

func (l *DefaultLogger) Panicf(format string, v ...interface{}) {
l.Logger.Panicf(format, v...)
}

func header(lvl, msg string) string {
return fmt.Sprintf("%s: %s", lvl, msg)
}
4 changes: 4 additions & 0 deletions tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type Tx struct {
pages map[common.Pgid]*common.Page
stats TxStats
commitHandlers []func()
Logger Logger

// WriteFlag specifies the flag for write-related methods like WriteTo().
// Tx opens the database file with the specified flag to copy the data.
Expand All @@ -56,6 +57,8 @@ func (tx *Tx) init(db *DB) {
tx.root.InBucket = &common.InBucket{}
*tx.root.InBucket = *(tx.meta.RootBucket())

tx.Logger = db.Logger

// Increment the transaction id and add a page cache for writable transactions.
if tx.writable {
tx.pages = make(map[common.Pgid]*common.Page)
Expand Down Expand Up @@ -148,6 +151,7 @@ func (tx *Tx) Commit() error {
return berrors.ErrTxNotWritable
}

tx.Logger.Infof("Committing transaction %d", tx.ID())
// TODO(benbjohnson): Use vectorized I/O to write out dirty pages.

// Rebalance nodes which have had deletions.
Expand Down
Loading