unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Restructure go-micro layout and plugins

Browse Source
This commit is contained in:
Asim
2015-05-23 20:04:16 +01:00
parent 018183fa49
commit 74fd1fc989
39 changed files with 673 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
store/consul/consul.go Normal file
View File

@@ -0,0 +1,11 @@
package consul
// This is a hack
import (
"github.com/myodc/go-micro/store"
)
func NewStore(addrs []string, opt ...store.Option) store.Store {
return store.NewStore(addrs, opt...)
}

6
store/consul_item.go
View File

@@ -1,14 +1,14 @@
package store
type ConsulItem struct {
type consulItem struct {
key string
value []byte
}
func (c *ConsulItem) Key() string {
func (c *consulItem) Key() string {
return c.key
}
func (c *ConsulItem) Value() []byte {
func (c *consulItem) Value() []byte {
return c.value
}

18
store/consul_store.go
View File

@@ -6,11 +6,11 @@ import (
consul "github.com/hashicorp/consul/api"
)
type ConsulStore struct {
type consulStore struct {
Client *consul.Client
}
func (c *ConsulStore) Get(key string) (Item, error) {
func (c *consulStore) Get(key string) (Item, error) {
kv, _, err := c.Client.KV().Get(key, nil)
if err != nil {
return nil, err
@@ -19,18 +19,18 @@ func (c *ConsulStore) Get(key string) (Item, error) {
return nil, errors.New("key not found")
}
return &ConsulItem{
return &consulItem{
key: kv.Key,
value: kv.Value,
}, nil
}
func (c *ConsulStore) Del(key string) error {
func (c *consulStore) Del(key string) error {
_, err := c.Client.KV().Delete(key, nil)
return err
}
func (c *ConsulStore) Put(item Item) error {
func (c *consulStore) Put(item Item) error {
_, err := c.Client.KV().Put(&consul.KVPair{
Key: item.Key(),
Value: item.Value(),
@@ -39,14 +39,14 @@ func (c *ConsulStore) Put(item Item) error {
return err
}
func (c *ConsulStore) NewItem(key string, value []byte) Item {
return &ConsulItem{
func (c *consulStore) NewItem(key string, value []byte) Item {
return &consulItem{
key: key,
value: value,
}
}
func NewConsulStore(addrs []string, opts ...Options) Store {
func newConsulStore(addrs []string, opt ...Option) Store {
config := consul.DefaultConfig()
if len(addrs) > 0 {
config.Address = addrs[0]
@@ -54,7 +54,7 @@ func NewConsulStore(addrs []string, opts ...Options) Store {
client, _ := consul.NewClient(config)
return &ConsulStore{
return &consulStore{
Client: client,
}
}

34
store/etcd_store.go → store/etcd/etcd.go
View File

@@ -1,16 +1,30 @@
package store
package etcd
import (
"errors"
"github.com/coreos/go-etcd/etcd"
"github.com/myodc/go-micro/store"
)
type EtcdStore struct {
type estore struct {
Client *etcd.Client
}
func (e *EtcdStore) Get(key string) (Item, error) {
type item struct {
key string
value []byte
}
func (i *item) Key() string {
return i.key
}
func (i *item) Value() []byte {
return i.value
}
func (e *estore) Get(key string) (store.Item, error) {
kv, err := e.Client.Get(key, false, false)
if err != nil {
return nil, err
@@ -19,38 +33,38 @@ func (e *EtcdStore) Get(key string) (Item, error) {
return nil, errors.New("key not found")
}
return &EtcdItem{
return &item{
key: kv.Node.Key,
value: []byte(kv.Node.Value),
}, nil
}
func (e *EtcdStore) Del(key string) error {
func (e *estore) Del(key string) error {
_, err := e.Client.Delete(key, false)
return err
}
func (e *EtcdStore) Put(item Item) error {
func (e *estore) Put(item store.Item) error {
_, err := e.Client.Set(item.Key(), string(item.Value()), 0)
return err
}
func (e *EtcdStore) NewItem(key string, value []byte) Item {
return &EtcdItem{
func (e *estore) NewItem(key string, value []byte) store.Item {
return &item{
key: key,
value: value,
}
}
func NewEtcdStore(addrs []string, opts ...Options) Store {
func NewStore(addrs []string, opts ...store.Option) store.Store {
if len(addrs) == 0 {
addrs = []string{"127.0.0.1:2379"}
}
client := etcd.NewClient(addrs)
return &EtcdStore{
return &estore{
Client: client,
}
}

14
store/etcd_item.go
View File

@@ -1,14 +0,0 @@
package store
type EtcdItem struct {
key string
value []byte
}
func (c *EtcdItem) Key() string {
return c.key
}
func (c *EtcdItem) Value() []byte {
return c.value
}

34
store/memcached_store.go → store/memcached/memcached.go
View File

@@ -1,16 +1,30 @@
package store
package memcached
import (
"errors"
mc "github.com/bradfitz/gomemcache/memcache"
"github.com/myodc/go-micro/store"
)
type MemcacheStore struct {
type mstore struct {
Client *mc.Client
}
func (m *MemcacheStore) Get(key string) (Item, error) {
type item struct {
key string
value []byte
}
func (i *item) Key() string {
return i.key
}
func (i *item) Value() []byte {
return i.value
}
func (m *mstore) Get(key string) (store.Item, error) {
kv, err := m.Client.Get(key)
if err != nil && err == mc.ErrCacheMiss {
return nil, errors.New("key not found")
@@ -22,35 +36,35 @@ func (m *MemcacheStore) Get(key string) (Item, error) {
return nil, errors.New("key not found")
}
return &MemcacheItem{
return &item{
key: kv.Key,
value: kv.Value,
}, nil
}
func (m *MemcacheStore) Del(key string) error {
func (m *mstore) Del(key string) error {
return m.Client.Delete(key)
}
func (m *MemcacheStore) Put(item Item) error {
func (m *mstore) Put(item store.Item) error {
return m.Client.Set(&mc.Item{
Key: item.Key(),
Value: item.Value(),
})
}
func (m *MemcacheStore) NewItem(key string, value []byte) Item {
return &MemcacheItem{
func (m *mstore) NewItem(key string, value []byte) store.Item {
return &item{
key: key,
value: value,
}
}
func NewMemcacheStore(addrs []string, opts ...Options) Store {
func NewStore(addrs []string, opts ...store.Option) store.Store {
if len(addrs) == 0 {
addrs = []string{"127.0.0.1:11211"}
}
return &MemcacheStore{
return &mstore{
Client: mc.New(addrs...),
}
}

14
store/memcached_item.go
View File

@@ -1,14 +0,0 @@
package store
type MemcacheItem struct {
key string
value []byte
}
func (m *MemcacheItem) Key() string {
return m.key
}
func (m *MemcacheItem) Value() []byte {
return m.value
}

63
store/memory/memory.go Normal file
View File

@@ -0,0 +1,63 @@
package memory
import (
"errors"
"sync"
"github.com/myodc/go-micro/store"
)
type mstore struct {
sync.RWMutex
store map[string]store.Item
}
type item struct {
key string
value []byte
}
func (i *item) Key() string {
return i.key
}
func (i *item) Value() []byte {
return i.value
}
func (m *mstore) Get(key string) (store.Item, error) {
m.RLock()
v, ok := m.store[key]
m.RUnlock()
if !ok {
return nil, errors.New("key not found")
}
return v, nil
}
func (m *mstore) Del(key string) error {
m.Lock()
delete(m.store, key)
m.Unlock()
return nil
}
func (m *mstore) Put(item store.Item) error {
m.Lock()
m.store[item.Key()] = item
m.Unlock()
return nil
}
func (m *mstore) NewItem(key string, value []byte) store.Item {
return &item{
key: key,
value: value,
}
}
func NewStore(addrs []string, opt ...store.Option) store.Store {
return &mstore{
store: make(map[string]store.Item),
}
}

14
store/memory_item.go
View File

@@ -1,14 +0,0 @@
package store
type MemoryItem struct {
key string
value []byte
}
func (m *MemoryItem) Key() string {
return m.key
}
func (m *MemoryItem) Value() []byte {
return m.value
}

48
store/memory_store.go
View File

@@ -1,48 +0,0 @@
package store
import (
"errors"
"sync"
)
type MemoryStore struct {
sync.RWMutex
store map[string]Item
}
func (m *MemoryStore) Get(key string) (Item, error) {
m.RLock()
v, ok := m.store[key]
m.RUnlock()
if !ok {
return nil, errors.New("key not found")
}
return v, nil
}
func (m *MemoryStore) Del(key string) error {
m.Lock()
delete(m.store, key)
m.Unlock()
return nil
}
func (m *MemoryStore) Put(item Item) error {
m.Lock()
m.store[item.Key()] = item
m.Unlock()
return nil
}
func (m *MemoryStore) NewItem(key string, value []byte) Item {
return &MemoryItem{
key: key,
value: value,
}
}
func NewMemoryStore(addrs []string, opts ...Options) Store {
return &MemoryStore{
store: make(map[string]Item),
}
}

8
store/store.go
View File

@@ -9,12 +9,16 @@ type Store interface {
type options struct{}
type Options func(*options)
type Option func(*options)
var (
DefaultStore = NewConsulStore([]string{})
DefaultStore = newConsulStore([]string{})
)
func NewStore(addrs []string, opt ...Option) Store {
return newConsulStore(addrs, opt...)
}
func Get(key string) (Item, error) {
return DefaultStore.Get(key)
}