From 73a2d351d47b7873facd0e75a680c0028c268cb5 Mon Sep 17 00:00:00 2001 From: jdl Date: Mon, 16 Oct 2023 09:39:50 +0200 Subject: [PATCH] goimports cleanup --- fstore/browser.go | 3 ++- fstore/command.go | 1 + fstore/paths.go | 3 ++- fstore/store-commands.go | 5 ++-- fstore/store-rep.go | 5 ++-- fstore/store.go | 7 +++--- lib/atomicheader/atomicheader.go | 3 ++- lib/httpconn/client.go | 3 ++- lib/rep/functions.go | 3 ++- lib/rep/http-client.go | 7 +++--- lib/rep/http-handler.go | 5 +++- lib/rep/rep-sendrecv.go | 3 ++- lib/rep/replicator-open.go | 5 ++-- lib/rep/replicator.go | 11 ++++----- lib/rep/testapp_test.go | 3 ++- lib/wal/corrupt_test.go | 3 ++- lib/wal/generic_test.go | 3 ++- lib/wal/io.go | 1 + lib/wal/record.go | 1 + lib/wal/record_test.go | 5 ++-- lib/wal/segment-iterator.go | 5 ++-- lib/wal/segment.go | 5 ++-- lib/wal/segment_test.go | 5 ++-- lib/wal/wal-iterator.go | 3 ++- lib/wal/wal-recv.go | 3 ++- lib/wal/wal-send.go | 3 ++- lib/wal/wal-sendrecv_test.go | 5 ++-- lib/wal/wal.go | 5 ++-- mdb/change/binary.go | 1 + mdb/change/change.go | 1 + mdb/collection.go | 17 +++++++------- mdb/crashconsistency_test.go | 3 ++- mdb/db-rep.go | 7 +++--- mdb/db-testcases_test.go | 34 +++++++++++++++------------- mdb/db-txaggregator.go | 1 + mdb/db.go | 9 ++++---- mdb/errors.go | 11 --------- mdb/pfile/change_test.go | 3 ++- mdb/pfile/main_test.go | 5 ++-- mdb/pfile/page.go | 5 ++-- mdb/pfile/page_test.go | 3 ++- mdb/pfile/pagefile.go | 5 ++-- mdb/pfile/record_test.go | 1 + mdb/snapshot.go | 3 ++- mdb/testing/crashconsistency/main.go | 3 ++- 45 files changed, 129 insertions(+), 97 deletions(-) delete mode 100644 mdb/errors.go diff --git a/fstore/browser.go b/fstore/browser.go index bfe71fb..4643ecf 100644 --- a/fstore/browser.go +++ b/fstore/browser.go @@ -3,10 +3,11 @@ package fstore import ( "embed" "io" - "git.crumpington.com/public/jldb/fstore/pages" "net/http" "os" "path/filepath" + + "git.crumpington.com/public/jldb/fstore/pages" ) //go:embed static/* diff --git a/fstore/command.go b/fstore/command.go index 07ffa81..8d58241 100644 --- a/fstore/command.go +++ b/fstore/command.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/binary" "io" + "git.crumpington.com/public/jldb/lib/errs" ) diff --git a/fstore/paths.go b/fstore/paths.go index 0efe19a..46c1cc6 100644 --- a/fstore/paths.go +++ b/fstore/paths.go @@ -1,9 +1,10 @@ package fstore import ( - "git.crumpington.com/public/jldb/lib/errs" "path/filepath" "strconv" + + "git.crumpington.com/public/jldb/lib/errs" ) func filesRootPath(rootDir string) string { diff --git a/fstore/store-commands.go b/fstore/store-commands.go index 6889e2a..6710ca1 100644 --- a/fstore/store-commands.go +++ b/fstore/store-commands.go @@ -1,11 +1,12 @@ package fstore import ( - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/idgen" "log" "os" "path/filepath" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/idgen" ) func (s *Store) applyStoreFromReader(cmd command) error { diff --git a/fstore/store-rep.go b/fstore/store-rep.go index 4d3d563..ea1c426 100644 --- a/fstore/store-rep.go +++ b/fstore/store-rep.go @@ -5,12 +5,13 @@ import ( "errors" "io" "io/fs" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/wal" "net" "os" "path/filepath" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/wal" ) func (s *Store) repSendState(conn net.Conn) error { diff --git a/fstore/store.go b/fstore/store.go index e2d13de..7676129 100644 --- a/fstore/store.go +++ b/fstore/store.go @@ -3,15 +3,16 @@ package fstore import ( "bytes" "io" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/idgen" - "git.crumpington.com/public/jldb/lib/rep" "net/http" "os" "path/filepath" "strconv" "sync" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/idgen" + "git.crumpington.com/public/jldb/lib/rep" ) type Config struct { diff --git a/lib/atomicheader/atomicheader.go b/lib/atomicheader/atomicheader.go index 9404dab..4396b93 100644 --- a/lib/atomicheader/atomicheader.go +++ b/lib/atomicheader/atomicheader.go @@ -3,9 +3,10 @@ package atomicheader import ( "encoding/binary" "hash/crc32" - "git.crumpington.com/public/jldb/lib/errs" "os" "sync" + + "git.crumpington.com/public/jldb/lib/errs" ) const ( diff --git a/lib/httpconn/client.go b/lib/httpconn/client.go index 39e6935..d5b7d2b 100644 --- a/lib/httpconn/client.go +++ b/lib/httpconn/client.go @@ -6,11 +6,12 @@ import ( "crypto/tls" "errors" "io" - "git.crumpington.com/public/jldb/lib/errs" "net" "net/http" "net/url" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) var ErrInvalidStatus = errors.New("invalid status") diff --git a/lib/rep/functions.go b/lib/rep/functions.go index d9ac3d2..c7b18ea 100644 --- a/lib/rep/functions.go +++ b/lib/rep/functions.go @@ -3,10 +3,11 @@ package rep import ( "encoding/binary" "encoding/json" - "git.crumpington.com/public/jldb/lib/errs" "net" "path/filepath" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) // ---------------------------------------------------------------------------- diff --git a/lib/rep/http-client.go b/lib/rep/http-client.go index a5e4fe2..19ded81 100644 --- a/lib/rep/http-client.go +++ b/lib/rep/http-client.go @@ -4,12 +4,13 @@ import ( "encoding/binary" "encoding/json" "io" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/httpconn" - "git.crumpington.com/public/jldb/lib/wal" "net" "sync" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/httpconn" + "git.crumpington.com/public/jldb/lib/wal" ) type client struct { diff --git a/lib/rep/http-handler.go b/lib/rep/http-handler.go index fe513e4..293ffb7 100644 --- a/lib/rep/http-handler.go +++ b/lib/rep/http-handler.go @@ -2,10 +2,11 @@ package rep import ( "crypto/subtle" - "git.crumpington.com/public/jldb/lib/httpconn" "log" "net/http" "time" + + "git.crumpington.com/public/jldb/lib/httpconn" ) const ( @@ -54,6 +55,7 @@ func (rep *Replicator) Handle(w http.ResponseWriter, r *http.Request) { switch cmd[0] { case cmdGetInfo: + if err := sendJSON(rep.Info(), conn, rep.conf.NetTimeout); err != nil { logf("Failed to send info: %s", err) return @@ -69,6 +71,7 @@ func (rep *Replicator) Handle(w http.ResponseWriter, r *http.Request) { } case cmdStreamWAL: + err := rep.wal.Send(conn, rep.conf.NetTimeout) if !rep.stopped() { logf("Failed when sending WAL: %s", err) diff --git a/lib/rep/rep-sendrecv.go b/lib/rep/rep-sendrecv.go index 184b49a..c4b72ba 100644 --- a/lib/rep/rep-sendrecv.go +++ b/lib/rep/rep-sendrecv.go @@ -2,9 +2,10 @@ package rep import ( "io" - "git.crumpington.com/public/jldb/lib/errs" "net" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) func (rep *Replicator) sendState(conn net.Conn) error { diff --git a/lib/rep/replicator-open.go b/lib/rep/replicator-open.go index 0eb6b04..f3ad18a 100644 --- a/lib/rep/replicator-open.go +++ b/lib/rep/replicator-open.go @@ -1,12 +1,13 @@ package rep import ( + "os" + "time" + "git.crumpington.com/public/jldb/lib/atomicheader" "git.crumpington.com/public/jldb/lib/errs" "git.crumpington.com/public/jldb/lib/flock" "git.crumpington.com/public/jldb/lib/wal" - "os" - "time" ) func (rep *Replicator) loadConfigDefaults() { diff --git a/lib/rep/replicator.go b/lib/rep/replicator.go index 2e4ce6e..c4b611f 100644 --- a/lib/rep/replicator.go +++ b/lib/rep/replicator.go @@ -2,14 +2,15 @@ package rep import ( "io" - "git.crumpington.com/public/jldb/lib/atomicheader" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/wal" "net" "os" "sync" "sync/atomic" "time" + + "git.crumpington.com/public/jldb/lib/atomicheader" + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/wal" ) type Config struct { @@ -161,10 +162,6 @@ func (rep *Replicator) Primary() bool { return rep.conf.Primary } -// TODO: Probably remove this. -// The caller may call Ack after Apply to acknowledge that the change has also -// been applied to the caller's application. Alternatively, the caller may use -// follow to apply changes to their application state. func (rep *Replicator) ack(seqNum, timestampMS int64) error { state := rep.getState() state.SeqNum = seqNum diff --git a/lib/rep/testapp_test.go b/lib/rep/testapp_test.go index 6438e12..b97baf9 100644 --- a/lib/rep/testapp_test.go +++ b/lib/rep/testapp_test.go @@ -5,12 +5,13 @@ import ( "encoding/binary" "encoding/json" "io" - "git.crumpington.com/public/jldb/lib/wal" "math/rand" "net" "sync" "testing" "time" + + "git.crumpington.com/public/jldb/lib/wal" ) // ---------------------------------------------------------------------------- diff --git a/lib/wal/corrupt_test.go b/lib/wal/corrupt_test.go index 82f5021..d5b77f7 100644 --- a/lib/wal/corrupt_test.go +++ b/lib/wal/corrupt_test.go @@ -2,8 +2,9 @@ package wal import ( "io" - "git.crumpington.com/public/jldb/lib/errs" "testing" + + "git.crumpington.com/public/jldb/lib/errs" ) func TestCorruptWAL(t *testing.T) { diff --git a/lib/wal/generic_test.go b/lib/wal/generic_test.go index 4ee6ba2..6a0f4d7 100644 --- a/lib/wal/generic_test.go +++ b/lib/wal/generic_test.go @@ -5,13 +5,14 @@ import ( "encoding/binary" "errors" "io" - "git.crumpington.com/public/jldb/lib/errs" "math/rand" "path/filepath" "reflect" "strings" "testing" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) type waLog interface { diff --git a/lib/wal/io.go b/lib/wal/io.go index b042973..b7400e7 100644 --- a/lib/wal/io.go +++ b/lib/wal/io.go @@ -5,6 +5,7 @@ import ( "errors" "hash/crc32" "io" + "git.crumpington.com/public/jldb/lib/errs" ) diff --git a/lib/wal/record.go b/lib/wal/record.go index baf41c9..db6914a 100644 --- a/lib/wal/record.go +++ b/lib/wal/record.go @@ -4,6 +4,7 @@ import ( "encoding/binary" "hash/crc32" "io" + "git.crumpington.com/public/jldb/lib/errs" ) diff --git a/lib/wal/record_test.go b/lib/wal/record_test.go index 365411c..e4faffe 100644 --- a/lib/wal/record_test.go +++ b/lib/wal/record_test.go @@ -3,10 +3,11 @@ package wal import ( "bytes" "io" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/testutil" "math/rand" "testing" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/testutil" ) func NewRecordForTesting() Record { diff --git a/lib/wal/segment-iterator.go b/lib/wal/segment-iterator.go index 6495f2b..890732d 100644 --- a/lib/wal/segment-iterator.go +++ b/lib/wal/segment-iterator.go @@ -1,10 +1,11 @@ package wal import ( - "git.crumpington.com/public/jldb/lib/atomicheader" - "git.crumpington.com/public/jldb/lib/errs" "os" "time" + + "git.crumpington.com/public/jldb/lib/atomicheader" + "git.crumpington.com/public/jldb/lib/errs" ) type segmentIterator struct { diff --git a/lib/wal/segment.go b/lib/wal/segment.go index c4bfaa4..44daaee 100644 --- a/lib/wal/segment.go +++ b/lib/wal/segment.go @@ -3,11 +3,12 @@ package wal import ( "bufio" "io" - "git.crumpington.com/public/jldb/lib/atomicheader" - "git.crumpington.com/public/jldb/lib/errs" "os" "sync" "time" + + "git.crumpington.com/public/jldb/lib/atomicheader" + "git.crumpington.com/public/jldb/lib/errs" ) type segment struct { diff --git a/lib/wal/segment_test.go b/lib/wal/segment_test.go index ab922f7..20b8078 100644 --- a/lib/wal/segment_test.go +++ b/lib/wal/segment_test.go @@ -4,11 +4,12 @@ import ( "bytes" crand "crypto/rand" "io" - "git.crumpington.com/public/jldb/lib/atomicheader" - "git.crumpington.com/public/jldb/lib/errs" "path/filepath" "testing" "time" + + "git.crumpington.com/public/jldb/lib/atomicheader" + "git.crumpington.com/public/jldb/lib/errs" ) func newSegmentForTesting(t *testing.T) *segment { diff --git a/lib/wal/wal-iterator.go b/lib/wal/wal-iterator.go index 5d0902d..0da5d43 100644 --- a/lib/wal/wal-iterator.go +++ b/lib/wal/wal-iterator.go @@ -1,8 +1,9 @@ package wal import ( - "git.crumpington.com/public/jldb/lib/errs" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) type walIterator struct { diff --git a/lib/wal/wal-recv.go b/lib/wal/wal-recv.go index 60cf008..eb991b8 100644 --- a/lib/wal/wal-recv.go +++ b/lib/wal/wal-recv.go @@ -3,9 +3,10 @@ package wal import ( "encoding/binary" "io" - "git.crumpington.com/public/jldb/lib/errs" "net" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) func (wal *WAL) Recv(conn net.Conn, timeout time.Duration) error { diff --git a/lib/wal/wal-send.go b/lib/wal/wal-send.go index 7ab7e70..51688b0 100644 --- a/lib/wal/wal-send.go +++ b/lib/wal/wal-send.go @@ -2,9 +2,10 @@ package wal import ( "encoding/binary" - "git.crumpington.com/public/jldb/lib/errs" "net" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) const ( diff --git a/lib/wal/wal-sendrecv_test.go b/lib/wal/wal-sendrecv_test.go index e4d2100..7fda037 100644 --- a/lib/wal/wal-sendrecv_test.go +++ b/lib/wal/wal-sendrecv_test.go @@ -1,8 +1,6 @@ package wal import ( - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/testutil" "log" "math/rand" "reflect" @@ -11,6 +9,9 @@ import ( "sync/atomic" "testing" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/testutil" ) func TestSendRecvHarness(t *testing.T) { diff --git a/lib/wal/wal.go b/lib/wal/wal.go index adeea7d..cff400b 100644 --- a/lib/wal/wal.go +++ b/lib/wal/wal.go @@ -2,13 +2,14 @@ package wal import ( "io" - "git.crumpington.com/public/jldb/lib/atomicheader" - "git.crumpington.com/public/jldb/lib/errs" "os" "path/filepath" "strconv" "sync" "time" + + "git.crumpington.com/public/jldb/lib/atomicheader" + "git.crumpington.com/public/jldb/lib/errs" ) type Config struct { diff --git a/mdb/change/binary.go b/mdb/change/binary.go index 727ce20..c7ae196 100644 --- a/mdb/change/binary.go +++ b/mdb/change/binary.go @@ -3,6 +3,7 @@ package change import ( "encoding/binary" "io" + "git.crumpington.com/public/jldb/lib/errs" ) diff --git a/mdb/change/change.go b/mdb/change/change.go index ff8f07d..415cf16 100644 --- a/mdb/change/change.go +++ b/mdb/change/change.go @@ -2,6 +2,7 @@ package change import ( "io" + "git.crumpington.com/public/jldb/lib/errs" ) diff --git a/mdb/collection.go b/mdb/collection.go index cd4bf63..7e20015 100644 --- a/mdb/collection.go +++ b/mdb/collection.go @@ -5,9 +5,10 @@ import ( "encoding/json" "errors" "hash/crc64" - "git.crumpington.com/public/jldb/lib/errs" "unsafe" + "git.crumpington.com/public/jldb/lib/errs" + "github.com/google/btree" ) @@ -189,7 +190,7 @@ func (c Collection[T]) Insert(tx *Snapshot, userItem *T) error { for i := range c.uniqueIndices { if c.uniqueIndices[i].insertConflict(tx, item) { - return ErrDuplicate.WithCollection(c.name).WithIndex(c.uniqueIndices[i].name) + return errs.Duplicate.WithCollection(c.name).WithIndex(c.uniqueIndices[i].name) } } @@ -216,12 +217,12 @@ func (c Collection[T]) Update(tx *Snapshot, userItem *T) error { old, ok := c.ByID.get(tx, item) if !ok { - return ErrNotFound + return errs.NotFound } for i := range c.uniqueIndices { if c.uniqueIndices[i].updateConflict(tx, item) { - return ErrDuplicate.WithCollection(c.name).WithIndex(c.uniqueIndices[i].name) + return errs.Duplicate.WithCollection(c.name).WithIndex(c.uniqueIndices[i].name) } } @@ -239,7 +240,7 @@ func (c Collection[T]) Upsert(tx *Snapshot, item *T) error { if err == nil { return nil } - if errors.Is(err, ErrDuplicate) { + if errors.Is(err, errs.Duplicate) { return c.Update(tx, item) } return err @@ -261,7 +262,7 @@ func (c Collection[T]) getByID(tx *Snapshot, itemID uint64) (*T, bool) { func (c Collection[T]) ensureMutable(tx *Snapshot) error { if !tx.writable() { - return ErrReadOnly + return errs.ReadOnly } state := c.getState(tx) @@ -282,7 +283,7 @@ func (c Collection[T]) insertItem(tx *Snapshot, itemID uint64, data []byte) erro // Check for insert conflict. for _, index := range c.uniqueIndices { if index.insertConflict(tx, item) { - return ErrDuplicate + return errs.Duplicate } } @@ -297,7 +298,7 @@ func (c Collection[T]) insertItem(tx *Snapshot, itemID uint64, data []byte) erro func (c Collection[T]) deleteItem(tx *Snapshot, itemID uint64) error { item, ok := c.getByID(tx, itemID) if !ok { - return ErrNotFound + return errs.NotFound } tx.delete(c.collectionID, itemID) diff --git a/mdb/crashconsistency_test.go b/mdb/crashconsistency_test.go index ead50f8..67bccfc 100644 --- a/mdb/crashconsistency_test.go +++ b/mdb/crashconsistency_test.go @@ -1,12 +1,13 @@ package mdb import ( - "git.crumpington.com/public/jldb/lib/errs" "log" "os" "os/exec" "testing" "time" + + "git.crumpington.com/public/jldb/lib/errs" ) func TestCrashConsistency(t *testing.T) { diff --git a/mdb/db-rep.go b/mdb/db-rep.go index fef2ba2..70dd3eb 100644 --- a/mdb/db-rep.go +++ b/mdb/db-rep.go @@ -1,13 +1,14 @@ package mdb import ( + "log" + "net" + "os" + "git.crumpington.com/public/jldb/lib/errs" "git.crumpington.com/public/jldb/lib/wal" "git.crumpington.com/public/jldb/mdb/change" "git.crumpington.com/public/jldb/mdb/pfile" - "log" - "net" - "os" ) func (db *Database) repSendState(conn net.Conn) error { diff --git a/mdb/db-testcases_test.go b/mdb/db-testcases_test.go index 626d4ba..c05f958 100644 --- a/mdb/db-testcases_test.go +++ b/mdb/db-testcases_test.go @@ -6,6 +6,8 @@ import ( "reflect" "strings" "testing" + + "git.crumpington.com/public/jldb/lib/errs" ) type DBTestCase struct { @@ -54,7 +56,7 @@ var testDBTestCases = []DBTestCase{{ Update: func(t *testing.T, db TestDB, tx *Snapshot) error { user, ok := db.Users.ByID.Get(tx, &User{ID: 1}) if !ok { - return ErrNotFound + return errs.NotFound } user.Name = "Bob" user.Email = "b@c.com" @@ -111,7 +113,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Insert(tx, user2) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{}, }}, @@ -131,7 +133,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Insert(tx, user2) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{}, }}, @@ -162,7 +164,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Insert(tx, user) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{ UsersByID: []User{{ID: 1, Name: "Alice", Email: "a@b.com"}}, @@ -197,7 +199,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Insert(tx, user) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{ UsersByID: []User{{ID: 1, Name: "Alice", Email: "a@b.com"}}, @@ -218,7 +220,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Insert(db.Snapshot(), user) }, - ExpectedUpdateError: ErrReadOnly, + ExpectedUpdateError: errs.ReadOnly, }}, }, { @@ -290,7 +292,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Update(tx, user) }, - ExpectedUpdateError: ErrNotFound, + ExpectedUpdateError: errs.NotFound, State: DBState{ UsersByID: []User{{ID: 5, Name: "Alice", Email: "a@b.com"}}, @@ -323,14 +325,14 @@ var testDBTestCases = []DBTestCase{{ Update: func(t *testing.T, db TestDB, tx *Snapshot) error { user, ok := db.Users.ByID.Get(tx, &User{ID: 1}) if !ok { - return ErrNotFound + return errs.NotFound } user.Name = "Bob" user.Email = "b@c.com" return db.Users.Update(db.Snapshot(), user) }, - ExpectedUpdateError: ErrReadOnly, + ExpectedUpdateError: errs.ReadOnly, State: DBState{ UsersByID: []User{{ID: 1, Name: "Alice", Email: "a@b.com"}}, @@ -451,7 +453,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Update(tx, user2) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{}, }}, @@ -493,14 +495,14 @@ var testDBTestCases = []DBTestCase{{ Update: func(t *testing.T, db TestDB, tx *Snapshot) error { u, ok := db.Users.ByID.Get(tx, &User{ID: 2}) if !ok { - return ErrNotFound + return errs.NotFound } u.Email = "a@b.com" return db.Users.Update(tx, u) }, - ExpectedUpdateError: ErrDuplicate, + ExpectedUpdateError: errs.Duplicate, State: DBState{ UsersByID: []User{ @@ -542,7 +544,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Delete(db.Snapshot(), 1) }, - ExpectedUpdateError: ErrReadOnly, + ExpectedUpdateError: errs.ReadOnly, State: DBState{ UsersByID: []User{{ID: 1, Name: "Alice", Email: "a@b.com"}}, @@ -575,7 +577,7 @@ var testDBTestCases = []DBTestCase{{ return db.Users.Delete(tx, 2) }, - ExpectedUpdateError: ErrNotFound, + ExpectedUpdateError: errs.NotFound, State: DBState{ UsersByID: []User{{ID: 1, Name: "Alice", Email: "a@b.com"}}, @@ -609,7 +611,7 @@ var testDBTestCases = []DBTestCase{{ u, ok := db.Users.ByID.Get(tx, &User{ID: 1}) if !ok { - return ErrNotFound + return errs.NotFound } if !reflect.DeepEqual(u, expected) { return errors.New("Not equal (id)") @@ -617,7 +619,7 @@ var testDBTestCases = []DBTestCase{{ u, ok = db.Users.ByEmail.Get(tx, &User{Email: "a@b.com"}) if !ok { - return ErrNotFound + return errs.NotFound } if !reflect.DeepEqual(u, expected) { return errors.New("Not equal (email)") diff --git a/mdb/db-txaggregator.go b/mdb/db-txaggregator.go index 958bd1c..9eadc9f 100644 --- a/mdb/db-txaggregator.go +++ b/mdb/db-txaggregator.go @@ -2,6 +2,7 @@ package mdb import ( "bytes" + "git.crumpington.com/public/jldb/mdb/change" ) diff --git a/mdb/db.go b/mdb/db.go index 17fe15e..a6f66ff 100644 --- a/mdb/db.go +++ b/mdb/db.go @@ -2,15 +2,16 @@ package mdb import ( "fmt" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/lib/rep" - "git.crumpington.com/public/jldb/mdb/change" - "git.crumpington.com/public/jldb/mdb/pfile" "net/http" "os" "sync" "sync/atomic" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/lib/rep" + "git.crumpington.com/public/jldb/mdb/change" + "git.crumpington.com/public/jldb/mdb/pfile" ) type Config struct { diff --git a/mdb/errors.go b/mdb/errors.go deleted file mode 100644 index 343379d..0000000 --- a/mdb/errors.go +++ /dev/null @@ -1,11 +0,0 @@ -package mdb - -import ( - "git.crumpington.com/public/jldb/lib/errs" -) - -var ( - ErrNotFound = errs.NotFound - ErrReadOnly = errs.ReadOnly - ErrDuplicate = errs.Duplicate -) diff --git a/mdb/pfile/change_test.go b/mdb/pfile/change_test.go index 3cd4502..922bd11 100644 --- a/mdb/pfile/change_test.go +++ b/mdb/pfile/change_test.go @@ -2,8 +2,9 @@ package pfile import ( crand "crypto/rand" - "git.crumpington.com/public/jldb/mdb/change" "math/rand" + + "git.crumpington.com/public/jldb/mdb/change" ) func randomChangeList() (changes []change.Change) { diff --git a/mdb/pfile/main_test.go b/mdb/pfile/main_test.go index a673804..3fc06b0 100644 --- a/mdb/pfile/main_test.go +++ b/mdb/pfile/main_test.go @@ -3,10 +3,11 @@ package pfile import ( "bytes" crand "crypto/rand" - "git.crumpington.com/public/jldb/lib/wal" - "git.crumpington.com/public/jldb/mdb/change" "path/filepath" "testing" + + "git.crumpington.com/public/jldb/lib/wal" + "git.crumpington.com/public/jldb/mdb/change" ) func newForTesting(t *testing.T) (*File, *Index) { diff --git a/mdb/pfile/page.go b/mdb/pfile/page.go index bc02d4f..f0d1f93 100644 --- a/mdb/pfile/page.go +++ b/mdb/pfile/page.go @@ -2,8 +2,9 @@ package pfile import ( "hash/crc32" - "git.crumpington.com/public/jldb/lib/errs" "unsafe" + + "git.crumpington.com/public/jldb/lib/errs" ) // ---------------------------------------------------------------------------- @@ -30,7 +31,7 @@ var emptyPage = func() dataPage { type pageHeader struct { CRC uint32 // IEEE CRC-32 checksum. PageType uint32 // One of the PageType* constants. - CollectionID uint64 // + CollectionID uint64 // ItemID uint64 DataSize uint64 NextPage uint64 diff --git a/mdb/pfile/page_test.go b/mdb/pfile/page_test.go index 0edd52d..8e1b46a 100644 --- a/mdb/pfile/page_test.go +++ b/mdb/pfile/page_test.go @@ -3,9 +3,10 @@ package pfile import ( "bytes" crand "crypto/rand" - "git.crumpington.com/public/jldb/lib/errs" "math/rand" "testing" + + "git.crumpington.com/public/jldb/lib/errs" ) func randomPage(t *testing.T) dataPage { diff --git a/mdb/pfile/pagefile.go b/mdb/pfile/pagefile.go index b607da3..c889e78 100644 --- a/mdb/pfile/pagefile.go +++ b/mdb/pfile/pagefile.go @@ -6,12 +6,13 @@ import ( "compress/gzip" "encoding/binary" "io" - "git.crumpington.com/public/jldb/lib/errs" - "git.crumpington.com/public/jldb/mdb/change" "net" "os" "sync" "time" + + "git.crumpington.com/public/jldb/lib/errs" + "git.crumpington.com/public/jldb/mdb/change" ) type File struct { diff --git a/mdb/pfile/record_test.go b/mdb/pfile/record_test.go index 24d0ec5..c4395ee 100644 --- a/mdb/pfile/record_test.go +++ b/mdb/pfile/record_test.go @@ -2,6 +2,7 @@ package pfile import ( "bytes" + "git.crumpington.com/public/jldb/lib/wal" "git.crumpington.com/public/jldb/mdb/change" ) diff --git a/mdb/snapshot.go b/mdb/snapshot.go index 8476f84..119d661 100644 --- a/mdb/snapshot.go +++ b/mdb/snapshot.go @@ -3,8 +3,9 @@ package mdb import ( "bytes" "encoding/json" - "git.crumpington.com/public/jldb/mdb/change" "sync/atomic" + + "git.crumpington.com/public/jldb/mdb/change" ) type Snapshot struct { diff --git a/mdb/testing/crashconsistency/main.go b/mdb/testing/crashconsistency/main.go index 42de62c..3ee0385 100644 --- a/mdb/testing/crashconsistency/main.go +++ b/mdb/testing/crashconsistency/main.go @@ -4,7 +4,6 @@ import ( "crypto/rand" "errors" "hash/crc32" - "git.crumpington.com/public/jldb/mdb" "log" mrand "math/rand" "os" @@ -13,6 +12,8 @@ import ( "sync" "sync/atomic" "time" + + "git.crumpington.com/public/jldb/mdb" ) type DataItem struct {