From 9a0147f07a4eaae087108bd1f07c792c8abb1181 Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 16 Jan 2020 17:54:31 +0100 Subject: [PATCH] removal: remove fsdb (#43) * removal: remove fsdb - remove fsdb as some parts are not implemented and we do ont use it anywhere Signed-off-by: Marko Baricevic * add changelog entry --- CHANGELOG.md | 4 + db.go | 6 +- fsdb.go | 283 --------------------------------------------------- 3 files changed, 5 insertions(+), 288 deletions(-) delete mode 100644 fsdb.go diff --git a/CHANGELOG.md b/CHANGELOG.md index a306f5843..c7bcc7418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Breaking Changes + +- [fsdb] [\#43](https://github.com/tendermint/tm-db/pull/43#event-2954801205) Remove FSDB + ## 0.4 **2020-1-7** diff --git a/db.go b/db.go index ca7d175fa..8972415bc 100644 --- a/db.go +++ b/db.go @@ -19,13 +19,9 @@ const ( // - requires gcc // - use cleveldb build tag (go build -tags cleveldb) CLevelDBBackend BackendType = "cleveldb" - // MemDBBackend represents in-memoty key value store, which is mostly used + // MemDBBackend represents in-memory key value store, which is mostly used // for testing. MemDBBackend BackendType = "memdb" - // FSDBBackend represents filesystem database - // - EXPERIMENTAL - // - slow - FSDBBackend BackendType = "fsdb" // BoltDBBackend represents bolt (uses etcd's fork of bolt - // github.com/etcd-io/bbolt) // - EXPERIMENTAL diff --git a/fsdb.go b/fsdb.go deleted file mode 100644 index 76871ffcc..000000000 --- a/fsdb.go +++ /dev/null @@ -1,283 +0,0 @@ -package db - -import ( - "fmt" - "io/ioutil" - "net/url" - "os" - "path/filepath" - "sort" - "sync" - - "github.com/pkg/errors" -) - -const ( - keyPerm = os.FileMode(0600) - dirPerm = os.FileMode(0700) -) - -func init() { - registerDBCreator(FSDBBackend, func(name, dir string) (DB, error) { - dbPath := filepath.Join(dir, name+".db") - return NewFSDB(dbPath), nil - }, false) -} - -var _ DB = (*FSDB)(nil) - -// It's slow. -type FSDB struct { - mtx sync.Mutex - dir string -} - -func NewFSDB(dir string) *FSDB { - err := os.MkdirAll(dir, dirPerm) - if err != nil { - panic(errors.Wrap(err, "Creating FSDB dir "+dir)) - } - database := &FSDB{ - dir: dir, - } - return database -} - -func (db *FSDB) Get(key []byte) ([]byte, error) { - db.mtx.Lock() - defer db.mtx.Unlock() - key = escapeKey(key) - - path := db.nameToPath(key) - value, err := read(path) - if os.IsNotExist(err) { - return nil, nil - } else if err != nil { - return nil, errors.Wrapf(err, "getting key %s (0x%X)", string(key), key) - } - return value, nil -} - -func (db *FSDB) Has(key []byte) (bool, error) { - db.mtx.Lock() - defer db.mtx.Unlock() - key = escapeKey(key) - - path := db.nameToPath(key) - return FileExists(path), nil -} - -func (db *FSDB) Set(key []byte, value []byte) error { - db.mtx.Lock() - defer db.mtx.Unlock() - - if err := db.SetNoLock(key, value); err != nil { - return err - } - return nil -} - -func (db *FSDB) SetSync(key []byte, value []byte) error { - db.mtx.Lock() - defer db.mtx.Unlock() - - if err := db.SetNoLock(key, value); err != nil { - return err - } - return nil -} - -// NOTE: Implements atomicSetDeleter. -func (db *FSDB) SetNoLock(key []byte, value []byte) error { - key = escapeKey(key) - value = nonNilBytes(value) - path := db.nameToPath(key) - err := write(path, value) - if err != nil { - return errors.Wrapf(err, "setting key %s (0x%X)", string(key), key) - } - return nil -} - -func (db *FSDB) Delete(key []byte) error { - db.mtx.Lock() - defer db.mtx.Unlock() - - if err := db.DeleteNoLock(key); err != nil { - return err - } - return nil -} - -func (db *FSDB) DeleteSync(key []byte) error { - db.mtx.Lock() - defer db.mtx.Unlock() - - if err := db.DeleteNoLock(key); err != nil { - return err - } - return nil -} - -// NOTE: Implements atomicSetDeleter. -func (db *FSDB) DeleteNoLock(key []byte) error { - key = escapeKey(key) - path := db.nameToPath(key) - err := remove(path) - if os.IsNotExist(err) { - return nil - } else if err != nil { - return errors.Wrapf(err, "removing key %s (0x%X)", string(key), key) - } - return nil -} - -func (db *FSDB) Close() error { - // Nothing to do. - return nil -} - -func (db *FSDB) Print() error { - db.mtx.Lock() - defer db.mtx.Unlock() - - return errors.New("fsdb.Print not yet implemented") -} - -func (db *FSDB) Stats() map[string]string { - db.mtx.Lock() - defer db.mtx.Unlock() - - panic("FSDB.Stats not yet implemented") -} - -func (db *FSDB) NewBatch() Batch { - db.mtx.Lock() - defer db.mtx.Unlock() - - // Not sure we would ever want to try... - // It doesn't seem easy for general filesystems. - panic("FSDB.NewBatch not yet implemented") -} - -func (db *FSDB) Mutex() *sync.Mutex { - return &(db.mtx) -} - -func (db *FSDB) Iterator(start, end []byte) (Iterator, error) { - return db.MakeIterator(start, end, false), nil -} - -func (db *FSDB) MakeIterator(start, end []byte, isReversed bool) Iterator { - db.mtx.Lock() - defer db.mtx.Unlock() - - // We need a copy of all of the keys. - // Not the best, but probably not a bottleneck depending. - keys, err := list(db.dir, start, end) - if err != nil { - panic(errors.Wrapf(err, "Listing keys in %s", db.dir)) - } - if isReversed { - sort.Sort(sort.Reverse(sort.StringSlice(keys))) - } else { - sort.Strings(keys) - } - return newMemDBIterator(db, keys, start, end) -} - -func (db *FSDB) ReverseIterator(start, end []byte) (Iterator, error) { - return db.MakeIterator(start, end, true), nil -} - -func (db *FSDB) nameToPath(name []byte) string { - n := url.PathEscape(string(name)) - return filepath.Join(db.dir, n) -} - -// Read some bytes to a file. -// CONTRACT: returns os errors directly without wrapping. -func read(path string) ([]byte, error) { - f, err := os.Open(path) - if err != nil { - return nil, err - } - defer f.Close() - - d, err := ioutil.ReadAll(f) - if err != nil { - return nil, err - } - return d, nil -} - -// Write some bytes from a file. -// CONTRACT: returns os errors directly without wrapping. -func write(path string, d []byte) error { - f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, keyPerm) - if err != nil { - return err - } - defer f.Close() - // fInfo, err := f.Stat() - // if err != nil { - // return err - // } - // if fInfo.Mode() != keyPerm { - // return tmerrors.NewErrPermissionsChanged(f.Name(), keyPerm, fInfo.Mode()) - // } - _, err = f.Write(d) - if err != nil { - return err - } - err = f.Sync() - return err -} - -// Remove a file. -// CONTRACT: returns os errors directly without wrapping. -func remove(path string) error { - return os.Remove(path) -} - -// List keys in a directory, stripping of escape sequences and dir portions. -// CONTRACT: returns os errors directly without wrapping. -func list(dirPath string, start, end []byte) ([]string, error) { - dir, err := os.Open(dirPath) - if err != nil { - return nil, err - } - defer dir.Close() - - names, err := dir.Readdirnames(0) - if err != nil { - return nil, err - } - var keys []string - for _, name := range names { - n, err := url.PathUnescape(name) - if err != nil { - return nil, fmt.Errorf("failed to unescape %s while listing", name) - } - key := unescapeKey([]byte(n)) - if IsKeyInDomain(key, start, end) { - keys = append(keys, string(key)) - } - } - return keys, nil -} - -// To support empty or nil keys, while the file system doesn't allow empty -// filenames. -func escapeKey(key []byte) []byte { - return []byte("k_" + string(key)) -} -func unescapeKey(escKey []byte) []byte { - if len(escKey) < 2 { - panic(fmt.Sprintf("Invalid esc key: %x", escKey)) - } - if string(escKey[:2]) != "k_" { - panic(fmt.Sprintf("Invalid esc key: %x", escKey)) - } - return escKey[2:] -}