- Move common interfaces and structures to the 'common' folder

- Update tests

Signed-off-by: Valery Piashchynski <[email protected]>

7 files changed, 23 insertions, 50 deletions

diff --git a/plugins/kv/drivers/boltdb/driver.go b/plugins/kv/drivers/boltdb/driver.go
index 4b675271..e5aac290 100644
--- a/plugins/kv/drivers/boltdb/driver.go
+++ b/plugins/kv/drivers/boltdb/driver.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 	kvv1 "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
 	"github.com/spiral/roadrunner/v2/utils"
diff --git a/plugins/kv/drivers/boltdb/plugin.go b/plugins/kv/drivers/boltdb/plugin.go
index 6ae1a1f6..c839130f 100644
--- a/plugins/kv/drivers/boltdb/plugin.go
+++ b/plugins/kv/drivers/boltdb/plugin.go
@@ -2,12 +2,15 @@ package boltdb
 
 import (
 	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 )
 
-const PluginName = "boltdb"
+const (
+	PluginName     string = "boltdb"
+	RootPluginName string = "kv"
+)
 
 // Plugin BoltDB K/V storage.
 type Plugin struct {
@@ -21,7 +24,7 @@ type Plugin struct {
 }
 
 func (s *Plugin) Init(log logger.Logger, cfg config.Configurer) error {
-	if !cfg.Has(kv.PluginName) {
+	if !cfg.Has(RootPluginName) {
 		return errors.E(errors.Disabled)
 	}
 
diff --git a/plugins/kv/drivers/memcached/driver.go b/plugins/kv/drivers/memcached/driver.go
index a2787d72..520ec7d5 100644
--- a/plugins/kv/drivers/memcached/driver.go
+++ b/plugins/kv/drivers/memcached/driver.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/bradfitz/gomemcache/memcache"
 	"github.com/spiral/errors"
+	kv "github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 	kvv1 "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
 )
diff --git a/plugins/kv/drivers/memcached/plugin.go b/plugins/kv/drivers/memcached/plugin.go
index 22ea5cca..59a2b7cb 100644
--- a/plugins/kv/drivers/memcached/plugin.go
+++ b/plugins/kv/drivers/memcached/plugin.go
@@ -2,12 +2,15 @@ package memcached
 
 import (
 	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/config"
-	"github.com/spiral/roadrunner/v2/plugins/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 )
 
-const PluginName = "memcached"
+const (
+	PluginName     string = "memcached"
+	RootPluginName string = "kv"
+)
 
 type Plugin struct {
 	// config plugin
@@ -17,7 +20,7 @@ type Plugin struct {
 }
 
 func (s *Plugin) Init(log logger.Logger, cfg config.Configurer) error {
-	if !cfg.Has(kv.PluginName) {
+	if !cfg.Has(RootPluginName) {
 		return errors.E(errors.Disabled)
 	}
 
diff --git a/plugins/kv/interface.go b/plugins/kv/interface.go
deleted file mode 100644
index ffdbbe62..00000000
--- a/plugins/kv/interface.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package kv
-
-import kvv1 "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
-
-// Storage represents single abstract storage.
-type Storage interface {
-	// Has checks if value exists.
-	Has(keys ...string) (map[string]bool, error)
-
-	// Get loads value content into a byte slice.
-	Get(key string) ([]byte, error)
-
-	// MGet loads content of multiple values
-	// Returns the map with existing keys and associated values
-	MGet(keys ...string) (map[string][]byte, error)
-
-	// Set used to upload item to KV with TTL
-	// 0 value in TTL means no TTL
-	Set(items ...*kvv1.Item) error
-
-	// MExpire sets the TTL for multiply keys
-	MExpire(items ...*kvv1.Item) error
-
-	// TTL return the rest time to live for provided keys
-	// Not supported for the memcached and boltdb
-	TTL(keys ...string) (map[string]string, error)
-
-	// Delete one or multiple keys.
-	Delete(keys ...string) error
-}
-
-// Constructor provides storage based on the config
-type Constructor interface {
-	// KVConstruct provides Storage based on the config key
-	KVConstruct(key string) (Storage, error)
-}
diff --git a/plugins/kv/plugin.go b/plugins/kv/plugin.go
index 03dbaed6..e9ea25df 100644
--- a/plugins/kv/plugin.go
+++ b/plugins/kv/plugin.go
@@ -5,10 +5,12 @@ import (
 
 	endure "github.com/spiral/endure/pkg/container"
 	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 )
 
+// PluginName linked to the memory, boltdb, memcached, redis plugins. DO NOT change w/o sync.
 const PluginName string = "kv"
 
 const (
@@ -25,9 +27,9 @@ const (
 type Plugin struct {
 	log logger.Logger
 	// constructors contains general storage constructors, such as boltdb, memory, memcached, redis.
-	constructors map[string]Constructor
+	constructors map[string]kv.Constructor
 	// storages contains user-defined storages, such as boltdb-north, memcached-us and so on.
-	storages map[string]Storage
+	storages map[string]kv.Storage
 	// KV configuration
 	cfg       Config
 	cfgPlugin config.Configurer
@@ -43,8 +45,8 @@ func (p *Plugin) Init(cfg config.Configurer, log logger.Logger) error {
 	if err != nil {
 		return errors.E(op, err)
 	}
-	p.constructors = make(map[string]Constructor, 5)
-	p.storages = make(map[string]Storage, 5)
+	p.constructors = make(map[string]kv.Constructor, 5)
+	p.storages = make(map[string]kv.Storage, 5)
 	p.log = log
 	p.cfgPlugin = cfg
 	return nil
@@ -203,7 +205,7 @@ func (p *Plugin) Collects() []interface{} {
 	}
 }
 
-func (p *Plugin) GetAllStorageDrivers(name endure.Named, constructor Constructor) {
+func (p *Plugin) GetAllStorageDrivers(name endure.Named, constructor kv.Constructor) {
 	// save the storage constructor
 	p.constructors[name.Name()] = constructor
 }
diff --git a/plugins/kv/rpc.go b/plugins/kv/rpc.go
index af763600..b9b302fe 100644
--- a/plugins/kv/rpc.go
+++ b/plugins/kv/rpc.go
@@ -2,6 +2,7 @@ package kv
 
 import (
 	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2/common/kv"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 	kvv1 "github.com/spiral/roadrunner/v2/proto/kv/v1beta"
 )
@@ -9,7 +10,7 @@ import (
 // Wrapper for the plugin
 type rpc struct {
 	// all available storages
-	storages map[string]Storage
+	storages map[string]kv.Storage
 	// svc is a plugin implementing Storage interface
 	srv *Plugin
 	// Logger