diff options
Diffstat (limited to 'src/dedo.go')
-rw-r--r-- | src/dedo.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/dedo.go b/src/dedo.go index c0aecaf..d8ce80e 100644 --- a/src/dedo.go +++ b/src/dedo.go @@ -115,7 +115,7 @@ type InMemory struct{ *pds.Map[[]byte, *Bucket] } -type ITx interface{ +type TxI interface{ CreateBucket ([]byte) (*Bucket, error) CreateBucketIfNotExists([]byte) (*Bucket, error) Bucket([]byte) *Bucket @@ -138,10 +138,10 @@ type SnapshotI interface{ Check() <-chan error } -type IDedo interface{ +type DedoI interface{ Close() error View (func(tx SnapshotI) error) error - Update(func(tx ITx) error) error + Update(func(tx TxI) error) error Path() string } @@ -201,7 +201,7 @@ type OpenOptionsT struct{ } type call struct { - fn func(ITx) error + fn func(TxI) error err chan<- error } @@ -330,7 +330,7 @@ type argsT struct{ type commandT struct{ name string getopt func(argsT, io.Writer) (argsT, bool) - exec func(argsT, IDedo, io.Reader, io.Writer) error + exec func(argsT, DedoI, io.Reader, io.Writer) error } @@ -1734,7 +1734,7 @@ func (m *InMemory) Path() string { return "" } -func (m *InMemory) Update(fn func(ITx) error) error { +func (m *InMemory) Update(fn func(TxI) error) error { tx := &inMemoryTx{ db: m, commitHandlers: []func(){}, @@ -1754,13 +1754,13 @@ func (m *InMemory) View(func(SnapshotI) error) error { return nil } -func OpenMemory() IDedo { +func OpenMemory() DedoI { return &InMemory{pds.NewMap[[]byte, *Bucket](nil)} } /// Open creates and opens a database at the given path. If the file does not /// exist then it will be created automatically. -func OpenWith(path string, options OpenOptionsT) (IDedo, error) { +func OpenWith(path string, options OpenOptionsT) (DedoI, error) { file, err := openFile(path) if err != nil { return nil, err @@ -1807,7 +1807,7 @@ func OpenWith(path string, options OpenOptionsT) (IDedo, error) { return db, nil } -func Open(path string) (IDedo, error) { +func Open(path string) (DedoI, error) { return OpenWith(path, defaultOptions) } @@ -2087,7 +2087,7 @@ func (db *DB) removeTx(tx *Tx) { /// /// Attempting to manually commit or rollback within the function will cause a /// panic. -func (db *DB) Update(fn func(ITx) error) error { +func (db *DB) Update(fn func(TxI) error) error { t, err := db.begin(true) if err != nil { return err @@ -2164,7 +2164,7 @@ func needsNewBatch(batch *batch, max int) bool { /// DB.MaxBatchDelay, respectively. /// /// DB.Batch() is only useful when there are multiple goroutines calling it. -func (db *DB) Batch(fn func(ITx) error) error { +func (db *DB) Batch(fn func(TxI) error) error { errCh := make(chan error, 1) db.batchMu.Lock() @@ -2213,7 +2213,7 @@ func (b *batch) run() { retry: for len(b.calls) > 0 { failIdx := -1 - err := b.db.Update(func(tx ITx) error { + err := b.db.Update(func(tx TxI) error { for i, c := range b.calls { err := safelyCall(c.fn, tx) if err != nil { @@ -2254,7 +2254,7 @@ func (p panicked) Error() string { return fmt.Sprintf("panic: %v", p.reason) } -func safelyCall(fn func(ITx) error, tx ITx) (err error) { +func safelyCall(fn func(TxI) error, tx TxI) (err error) { defer func() { p := recover() if p != nil { @@ -3973,7 +3973,7 @@ func setGetopt(args argsT, w io.Writer) (argsT, bool) { return args, true } -func checkExec(args argsT, db IDedo, _r io.Reader, _w io.Writer) error { +func checkExec(args argsT, db DedoI, _r io.Reader, _w io.Writer) error { return db.View(func(snapshot SnapshotI) error { var errs error for err := range snapshot.Check() { @@ -3983,7 +3983,7 @@ func checkExec(args argsT, db IDedo, _r io.Reader, _w io.Writer) error { }) } -func getExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { +func getExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { return db.View(func(snapshot SnapshotI) error { bucket := snapshot.Bucket(args.bucket) if bucket == nil { @@ -4000,8 +4000,8 @@ func getExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { }) } -func setExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { - return db.Update(func(tx ITx) error { +func setExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { + return db.Update(func(tx TxI) error { bucket, err := tx.CreateBucketIfNotExists(args.bucket) if err != nil { return err @@ -4011,8 +4011,8 @@ func setExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { }) } -func rmExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { - return db.Update(func(tx ITx) error { +func rmExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { + return db.Update(func(tx TxI) error { bucket := tx.Bucket(args.bucket) if bucket == nil { return ErrBucketNotFound @@ -4022,7 +4022,7 @@ func rmExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { }) } -func listExec(args argsT, db IDedo, r io.Reader, w io.Writer) error { +func listExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { return db.View(func(snapshot SnapshotI) error { if len(args.bucket) == 0 { return snapshot.ForEach(func( |