diff --git a/.github/workflows/test-sqlite3.yml b/.github/workflows/test-sqlite3.yml deleted file mode 100644 index c691bfd3..00000000 --- a/.github/workflows/test-sqlite3.yml +++ /dev/null @@ -1,24 +0,0 @@ -'on': - - push - - pull_request -name: SQLite3 -jobs: - Tests: - strategy: - matrix: - go-version: - - 1.14.x - - 1.15.x - platform: - - ubuntu-latest - - windows-latest - runs-on: '${{ matrix.platform }}' - steps: - - name: Install Go - uses: actions/setup-go@v1 - with: - go-version: '${{ matrix.go-version }}' - - name: Fetch Repository - uses: actions/checkout@v2 - - name: Run Test - run: cd ./sqlite3 && go test ./... -v -race diff --git a/.github/workflows/test-memory.yml b/.github/workflows/test.yml similarity index 73% rename from .github/workflows/test-memory.yml rename to .github/workflows/test.yml index d4f3cb30..44f88a4f 100644 --- a/.github/workflows/test-memory.yml +++ b/.github/workflows/test.yml @@ -20,5 +20,9 @@ jobs: go-version: '${{ matrix.go-version }}' - name: Fetch Repository uses: actions/checkout@v2 - - name: Run Test + - name: Test Badger + run: cd ./badger && go test ./... -v -race + - name: Test Memory run: cd ./memory && go test ./... -v -race + - name: Test SQLite3 + run: cd ./sqlite3 && go test ./... -v -race diff --git a/badger/README.md b/badger/README.md new file mode 100644 index 00000000..85a12e35 --- /dev/null +++ b/badger/README.md @@ -0,0 +1,80 @@ +# Badger + +A fast key-value DB using [dgraph-io/badger](https://github.com/dgraph-io/badger) + +### Table of Contents +- [Signatures](#signatures) +- [Installation](#installation) +- [Examples](#examples) +- [Config](#config) +- [Default Config](#default-config) + + +### Signatures +```go +func New(config ...Config) Storage + +var ErrNotExist = errors.New("key does not exist") + +func (s *Storage) Get(key string) ([]byte, error) +func (s *Storage) Set(key string, val []byte, exp time.Duration) error +func (s *Storage) Delete(key string) error +func (s *Storage) Reset() error +func (s *Storage) Close() error +``` + +### Installation +Badger is tested on the 2 last [Go versions](https://golang.org/dl/) with support for modules. So make sure to initialize one first if you didn't do that yet: +```bash +go mod init github.com// +``` +And then install the badger implementation: +```bash +go get github.com/gofiber/storage/badger +``` + +### Examples +Import the storage package. +```go +import "github.com/gofiber/storage/badger" +``` + +You can use the following possibilities to create a storage: +```go +// Initialize default config +store := badger.New() + +// Initialize custom config +store := badger.New(badger.Config{ + Database: "./fiber.badger", + Reset: false, + GCInterval: 10 * time.Second, +}) +``` + +### Config +```go + // Database name + // + // Optional. Default is "./fiber.badger" + Database string + + // Reset clears any existing keys in existing Table + // + // Optional. Default is false + Reset bool + + // Time before deleting expired keys + // + // Optional. Default is 10 * time.Second + GCInterval time.Duration +``` + +### Default Config +```go +var ConfigDefault = Config{ + Database: "./fiber.badger", + Reset: false, + GCInterval: 10 * time.Second, +} +``` diff --git a/badger/badger.go b/badger/badger.go new file mode 100644 index 00000000..38a32473 --- /dev/null +++ b/badger/badger.go @@ -0,0 +1,126 @@ +package badger + +import ( + "errors" + "time" + + "github.com/dgraph-io/badger" + "github.com/gofiber/utils" +) + +// Storage interface that is implemented by storage providers +type Storage struct { + db *badger.DB + gcInterval time.Duration + done chan struct{} +} + +// Common storage errors +var ErrNotExist = errors.New("key does not exist") + +// New creates a new memory storage +func New(config ...Config) *Storage { + // Set default config + cfg := configDefault(config...) + + // Set options + opt := badger.DefaultOptions(cfg.Database).WithTruncate(true).WithLogger(nil) + + // Open database + db, err := badger.Open(opt) + if err != nil { + panic(err) + } + + if cfg.Reset { + if err := db.DropAll(); err != nil { + panic(err) + } + } + + // Create storage + store := &Storage{ + db: db, + gcInterval: cfg.GCInterval, + done: make(chan struct{}), + } + + // Start garbage collector + go store.gc() + + return store +} + +// Get value by key +func (s *Storage) Get(key string) ([]byte, error) { + var data []byte + err := s.db.View(func(txn *badger.Txn) error { + item, err := txn.Get([]byte(key)) + if err != nil { + return err + } + // item.Value() is only valid within the transaction. + // We can either copy it ourselves or use the ValueCopy() method. + // TODO: Benchmark if it's faster to copy + close tx, + // or to keep the tx open until unmarshalling is done. + data, err = item.ValueCopy(nil) + return err + }) + // If no value was found return false + if err == badger.ErrKeyNotFound { + return data, ErrNotExist + } + return data, err +} + +// Set key with value +func (s *Storage) Set(key string, val []byte, exp time.Duration) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 || len(val) <= 0 { + return nil + } + + entry := badger.NewEntry(utils.UnsafeBytes(key), val) + if exp != 0 { + entry.WithTTL(exp) + } + return s.db.Update(func(tx *badger.Txn) error { + return tx.SetEntry(entry) + }) +} + +// Delete key by key +func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } + return s.db.Update(func(tx *badger.Txn) error { + return tx.Delete(utils.UnsafeBytes(key)) + }) +} + +// Reset all keys +func (s *Storage) Reset() error { + return s.db.DropAll() +} + +// Close the memory storage +func (s *Storage) Close() error { + s.done <- struct{}{} + return s.db.Close() +} + +func (s *Storage) gc() { + ticker := time.NewTicker(s.gcInterval) + defer ticker.Stop() + + for { + select { + case <-s.done: + return + case <-ticker.C: + _ = s.db.RunValueLogGC(0.7) + } + } +} diff --git a/badger/badger_test.go b/badger/badger_test.go new file mode 100644 index 00000000..b39a8b5b --- /dev/null +++ b/badger/badger_test.go @@ -0,0 +1,121 @@ +package badger + +import ( + "testing" + "time" + + "github.com/gofiber/utils" +) + +var testStore = New() + +func Test_Badger_Set(t *testing.T) { + var ( + key = "john" + val = []byte("doe") + ) + + err := testStore.Set(key, val, 0) + utils.AssertEqual(t, nil, err) +} + +func Test_Badger_Set_Override(t *testing.T) { + var ( + key = "john" + val = []byte("doe") + ) + + err := testStore.Set(key, val, 0) + utils.AssertEqual(t, nil, err) + + err = testStore.Set(key, val, 0) + utils.AssertEqual(t, nil, err) +} + +func Test_Badger_Get(t *testing.T) { + var ( + key = "john" + val = []byte("doe") + ) + + err := testStore.Set(key, val, 0) + utils.AssertEqual(t, nil, err) + + result, err := testStore.Get(key) + utils.AssertEqual(t, nil, err) + utils.AssertEqual(t, val, result) +} + +func Test_Badger_Set_Expiration(t *testing.T) { + var ( + key = "john" + val = []byte("doe") + exp = 1 * time.Second + ) + + err := testStore.Set(key, val, exp) + utils.AssertEqual(t, nil, err) + + time.Sleep(1100 * time.Millisecond) +} + +func Test_Badger_Get_Expired(t *testing.T) { + var ( + key = "john" + ) + + result, err := testStore.Get(key) + utils.AssertEqual(t, ErrNotExist, err) + utils.AssertEqual(t, true, len(result) == 0) +} + +func Test_Badger_Get_NotExist(t *testing.T) { + + result, err := testStore.Get("notexist") + utils.AssertEqual(t, ErrNotExist, err) + utils.AssertEqual(t, true, len(result) == 0) +} + +func Test_Badger_Delete(t *testing.T) { + var ( + key = "john" + val = []byte("doe") + ) + + err := testStore.Set(key, val, 0) + utils.AssertEqual(t, nil, err) + + err = testStore.Delete(key) + utils.AssertEqual(t, nil, err) + + result, err := testStore.Get(key) + utils.AssertEqual(t, ErrNotExist, err) + utils.AssertEqual(t, true, len(result) == 0) +} + +func Test_Badger_Reset(t *testing.T) { + var ( + val = []byte("doe") + ) + + err := testStore.Set("john1", val, 0) + utils.AssertEqual(t, nil, err) + + err = testStore.Set("john2", val, 0) + utils.AssertEqual(t, nil, err) + + err = testStore.Reset() + utils.AssertEqual(t, nil, err) + + result, err := testStore.Get("john1") + utils.AssertEqual(t, ErrNotExist, err) + utils.AssertEqual(t, true, len(result) == 0) + + result, err = testStore.Get("john2") + utils.AssertEqual(t, ErrNotExist, err) + utils.AssertEqual(t, true, len(result) == 0) +} + +func Test_Badger_Close(t *testing.T) { + utils.AssertEqual(t, nil, testStore.Close()) +} diff --git a/badger/config.go b/badger/config.go new file mode 100644 index 00000000..8dc516e6 --- /dev/null +++ b/badger/config.go @@ -0,0 +1,48 @@ +package badger + +import "time" + +// Config defines the config for storage. +type Config struct { + // Database name + // + // Optional. Default is "./fiber.badger" + Database string + + // Reset clears any existing keys in existing Table + // + // Optional. Default is false + Reset bool + + // Time before deleting expired keys + // + // Optional. Default is 10 * time.Second + GCInterval time.Duration +} + +// ConfigDefault is the default config +var ConfigDefault = Config{ + Database: "./fiber.badger", + Reset: false, + GCInterval: 10 * time.Second, +} + +// Helper function to set default values +func configDefault(config ...Config) Config { + // Return default config if nothing provided + if len(config) < 1 { + return ConfigDefault + } + + // Override default config + cfg := config[0] + + // Set default values + if cfg.Database == "" { + cfg.Database = ConfigDefault.Database + } + if int(cfg.GCInterval) == 0 { + cfg.GCInterval = ConfigDefault.GCInterval + } + return cfg +} diff --git a/badger/go.mod b/badger/go.mod new file mode 100644 index 00000000..4e062a99 --- /dev/null +++ b/badger/go.mod @@ -0,0 +1,9 @@ +module github.com/gofiber/storage/badger + +go 1.15 + +require ( + github.com/dgraph-io/badger v1.6.2 + github.com/gofiber/utils v0.1.2 + go.etcd.io/bbolt v1.3.5 +) diff --git a/badger/go.sum b/badger/go.sum new file mode 100644 index 00000000..7a0a1e61 --- /dev/null +++ b/badger/go.sum @@ -0,0 +1,66 @@ +github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= +github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8= +github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= +github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po= +github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/gofiber/utils v0.1.2 h1:1SH2YEz4RlNS0tJlMJ0bGwO0JkqPqvq6TbHK9tXZKtk= +github.com/gofiber/utils v0.1.2/go.mod h1:pacRFtghAE3UoknMOUiXh2Io/nLWSUHtQCi/3QASsOc= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/memcache/memcache.go b/memcache/memcache.go index ad3af6fe..57977f80 100644 --- a/memcache/memcache.go +++ b/memcache/memcache.go @@ -70,10 +70,11 @@ func (s *Storage) Get(key string) ([]byte, error) { return item.Value, nil } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } item := s.acquireItem() @@ -90,6 +91,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete key by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } return s.db.Delete(key) } diff --git a/memcache/memcache_test.go b/memcache/memcache_test.go index fddcf1b6..f128d6d1 100644 --- a/memcache/memcache_test.go +++ b/memcache/memcache_test.go @@ -93,7 +93,7 @@ func Test_Memcache_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_Memcache_Clear(t *testing.T) { +func Test_Memcache_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -115,3 +115,7 @@ func Test_Memcache_Clear(t *testing.T) { utils.AssertEqual(t, ErrNotExist, err) utils.AssertEqual(t, true, len(result) == 0) } + +func Test_Memcache_Close(t *testing.T) { + utils.AssertEqual(t, nil, testStore.Close()) +} diff --git a/memory/memory.go b/memory/memory.go index 740a9242..0b62457a 100644 --- a/memory/memory.go +++ b/memory/memory.go @@ -52,12 +52,14 @@ func (s *Storage) Get(key string) ([]byte, error) { return v.data, nil } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } + var expire int64 if exp != 0 { expire = time.Now().Add(exp).Unix() @@ -71,6 +73,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete key by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } s.mux.Lock() delete(s.db, key) s.mux.Unlock() diff --git a/memory/memory_test.go b/memory/memory_test.go index f9e4decb..e2977a9b 100644 --- a/memory/memory_test.go +++ b/memory/memory_test.go @@ -93,7 +93,7 @@ func Test_Memory_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_Memory_Clear(t *testing.T) { +func Test_Memory_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -117,9 +117,5 @@ func Test_Memory_Clear(t *testing.T) { } func Test_Memory_Close(t *testing.T) { - s := Storage{done: make(chan struct{}, 1)} - - err := s.Close() - utils.AssertEqual(t, nil, err) - utils.AssertEqual(t, 1, len(s.done)) + utils.AssertEqual(t, nil, testStore.Close()) } diff --git a/mongodb/mongodb.go b/mongodb/mongodb.go index 2fd13ec6..60345b24 100644 --- a/mongodb/mongodb.go +++ b/mongodb/mongodb.go @@ -137,9 +137,10 @@ func (s *Storage) Get(key string) ([]byte, error) { // Set key with value, replace if document exits // // document will be remove automatically if exp is set, based on MongoDB TTL Indexes +// Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } @@ -159,6 +160,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete document by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } _, err := s.col.DeleteOne(context.Background(), bson.M{"key": key}) return err } diff --git a/mongodb/mongodb_test.go b/mongodb/mongodb_test.go index 9200df61..f204dd1a 100644 --- a/mongodb/mongodb_test.go +++ b/mongodb/mongodb_test.go @@ -95,7 +95,7 @@ func Test_MongoDB_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_MongoDB_Clear(t *testing.T) { +func Test_MongoDB_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -117,3 +117,7 @@ func Test_MongoDB_Clear(t *testing.T) { utils.AssertEqual(t, ErrNotExist, err) utils.AssertEqual(t, true, len(result) == 0) } + +func Test_MongoDB_Close(t *testing.T) { + utils.AssertEqual(t, nil, testStore.Close()) +} diff --git a/mysql/mysql.go b/mysql/mysql.go index 2ecee278..44526bdd 100644 --- a/mysql/mysql.go +++ b/mysql/mysql.go @@ -123,10 +123,11 @@ func (s *Storage) Get(key string) ([]byte, error) { return data, nil } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } var expSeconds int64 @@ -140,6 +141,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete key by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } _, err := s.db.Exec(s.sqlDelete, key) return err } diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go index f7c40717..b33c8d50 100644 --- a/mysql/mysql_test.go +++ b/mysql/mysql_test.go @@ -99,7 +99,7 @@ func Test_MYSQL_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_MYSQL_Clear(t *testing.T) { +func Test_MYSQL_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -122,7 +122,6 @@ func Test_MYSQL_Clear(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_Mysql_Close(t *testing.T) { - err := testStore.Close() - utils.AssertEqual(t, nil, err) +func Test_MYSQL_Close(t *testing.T) { + utils.AssertEqual(t, nil, testStore.Close()) } diff --git a/postgres/postgres.go b/postgres/postgres.go index a04ee9bc..dfeb5274 100644 --- a/postgres/postgres.go +++ b/postgres/postgres.go @@ -137,10 +137,11 @@ func (s *Storage) Get(key string) ([]byte, error) { return data, nil } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } var expSeconds int64 @@ -154,6 +155,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete entry by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } _, err := s.db.Exec(s.sqlDelete, key) return err } diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go index 881648bf..d0b3d212 100644 --- a/postgres/postgres_test.go +++ b/postgres/postgres_test.go @@ -99,7 +99,7 @@ func Test_Postgres_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_Postgres_Clear(t *testing.T) { +func Test_Postgres_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -123,6 +123,5 @@ func Test_Postgres_Clear(t *testing.T) { } func Test_Postgres_Close(t *testing.T) { - err := testStore.Close() - utils.AssertEqual(t, nil, err) + utils.AssertEqual(t, nil, testStore.Close()) } diff --git a/redis/redis.go b/redis/redis.go index 920ddde8..0b51a86c 100644 --- a/redis/redis.go +++ b/redis/redis.go @@ -57,10 +57,11 @@ func (s *Storage) Get(key string) ([]byte, error) { return val, err } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } return s.db.Set(context.Background(), key, val, exp).Err() @@ -68,6 +69,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete key by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } return s.db.Del(context.Background(), key).Err() } diff --git a/redis/redis_test.go b/redis/redis_test.go index 08b79216..d6e8c648 100644 --- a/redis/redis_test.go +++ b/redis/redis_test.go @@ -94,7 +94,7 @@ func Test_Redis_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_Redis_Clear(t *testing.T) { +func Test_Redis_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -116,3 +116,7 @@ func Test_Redis_Clear(t *testing.T) { utils.AssertEqual(t, ErrNotExist, err) utils.AssertEqual(t, true, len(result) == 0) } + +func Test_Redis_Close(t *testing.T) { + utils.AssertEqual(t, nil, testStore.Close()) +} diff --git a/sqlite3/sqlite3.go b/sqlite3/sqlite3.go index 51991ed0..7c4003a7 100644 --- a/sqlite3/sqlite3.go +++ b/sqlite3/sqlite3.go @@ -117,10 +117,11 @@ func (s *Storage) Get(key string) ([]byte, error) { return data, nil } +// Set key with value // Set key with value func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Ain't Nobody Got Time For That - if len(val) <= 0 { + if len(key) <= 0 || len(val) <= 0 { return nil } var expSeconds int64 @@ -133,6 +134,10 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error { // Delete entry by key func (s *Storage) Delete(key string) error { + // Ain't Nobody Got Time For That + if len(key) <= 0 { + return nil + } _, err := s.db.Exec(s.sqlDelete, key) return err } diff --git a/sqlite3/sqlite3_test.go b/sqlite3/sqlite3_test.go index 390bc6c5..96e8f9a8 100644 --- a/sqlite3/sqlite3_test.go +++ b/sqlite3/sqlite3_test.go @@ -96,7 +96,7 @@ func Test_SQLite3_Delete(t *testing.T) { utils.AssertEqual(t, true, len(result) == 0) } -func Test_SQLite3_Clear(t *testing.T) { +func Test_SQLite3_Reset(t *testing.T) { var ( val = []byte("doe") ) @@ -120,6 +120,5 @@ func Test_SQLite3_Clear(t *testing.T) { } func Test_SQLite3_Close(t *testing.T) { - err := testStore.Close() - utils.AssertEqual(t, nil, err) + utils.AssertEqual(t, nil, testStore.Close()) }