diff options
-rw-r--r-- | src/dedo.go | 20 | ||||
-rw-r--r-- | tests/dedo.go | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/dedo.go b/src/dedo.go index baf0d37..e69dbd4 100644 --- a/src/dedo.go +++ b/src/dedo.go @@ -138,7 +138,7 @@ type TransactionI interface{ OnCommit(func()) } -type DedoI interface{ +type DatabaseI interface{ Close() error View (func(tx SnapshotI) error) error Update(func(tx TransactionI) error) error @@ -330,7 +330,7 @@ type argsT struct{ type commandT struct{ name string getopt func(argsT, io.Writer) (argsT, bool) - exec func(argsT, DedoI, io.Reader, io.Writer) error + exec func(argsT, DatabaseI, io.Reader, io.Writer) error } @@ -1755,14 +1755,14 @@ func (m *InMemory) View(func(SnapshotI) error) error { return nil } -func OpenMemory() DedoI { +func OpenMemory() DatabaseI { 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) (DedoI, error) { +func OpenWith(path string, options OpenOptionsT) (DatabaseI, error) { file, err := openFile(path) if err != nil { return nil, err @@ -1809,7 +1809,7 @@ func OpenWith(path string, options OpenOptionsT) (DedoI, error) { return db, nil } -func Open(path string) (DedoI, error) { +func Open(path string) (DatabaseI, error) { return OpenWith(path, defaultOptions) } @@ -3968,7 +3968,7 @@ func setGetopt(args argsT, w io.Writer) (argsT, bool) { return args, true } -func checkExec(args argsT, db DedoI, _r io.Reader, _w io.Writer) error { +func checkExec(args argsT, db DatabaseI, _r io.Reader, _w io.Writer) error { return db.View(func(snapshot SnapshotI) error { var errs error for err := range snapshot.Check() { @@ -3978,7 +3978,7 @@ func checkExec(args argsT, db DedoI, _r io.Reader, _w io.Writer) error { }) } -func getExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { +func getExec(args argsT, db DatabaseI, r io.Reader, w io.Writer) error { return db.View(func(snapshot SnapshotI) error { bucket := snapshot.Bucket(args.bucket) if bucket == nil { @@ -3995,7 +3995,7 @@ func getExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { }) } -func setExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { +func setExec(args argsT, db DatabaseI, r io.Reader, w io.Writer) error { return db.Update(func(tx TransactionI) error { bucket, err := tx.CreateBucketIfNotExists(args.bucket) if err != nil { @@ -4006,7 +4006,7 @@ func setExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { }) } -func rmExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { +func rmExec(args argsT, db DatabaseI, r io.Reader, w io.Writer) error { return db.Update(func(tx TransactionI) error { bucket := tx.Bucket(args.bucket) if bucket == nil { @@ -4017,7 +4017,7 @@ func rmExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { }) } -func listExec(args argsT, db DedoI, r io.Reader, w io.Writer) error { +func listExec(args argsT, db DatabaseI, r io.Reader, w io.Writer) error { return db.View(func(snapshot SnapshotI) error { if len(args.bucket) == 0 { return snapshot.ForEach(func( diff --git a/tests/dedo.go b/tests/dedo.go index e2b9299..61ebca6 100644 --- a/tests/dedo.go +++ b/tests/dedo.go @@ -488,7 +488,7 @@ func test_runCommand() { good := commandT{ exec: func( _ argsT, - _ DedoI, + _ DatabaseI, _ io.Reader, w io.Writer, ) error { @@ -499,7 +499,7 @@ func test_runCommand() { bad := commandT{ exec: func( _ argsT, - _ DedoI, + _ DatabaseI, _ io.Reader, w io.Writer, ) error { |