Merge pull request #7 from fastone-open/topic/neo/fix-mem

fix(memory): add generic memory support

Author: neocxf

services/fs/utils.go

@@ -27,7 +27,7 @@ type Service struct {
 
 // String implements Service.String.
 func (s *Service) String() string {
-	return fmt.Sprintf("Servicer qingstor {AccessKey: %s}", "")
+	return fmt.Sprintf("Servicer fs {WorkDir: %s}", s.workDir)
 }
 
 // Std{in/out/err} support

services/memory/generated.go

@@ -11,8 +11,16 @@ var Metadata = def.Metadata{
 	Infos: []def.Info{},
 	Factory: []def.Pair{
 		def.PairWorkDir,
+		def.PairName,
+	},
+	Service: def.Service{
+		Features: types.ServiceFeatures{
+			Create: true,
+			Delete: true,
+			Get:    true,
+			List:   true,
+		},
 	},
-	Service: def.Service{},
 	Storage: def.Storage{
 		Features: types.StorageFeatures{
 			WriteEmptyObject: true,

services/memory/internal/cmd/meta.go

@@ -2,59 +2,81 @@ package memory
 
 import (
 	"context"
-	"errors"
-	"sync"
+	"path"
 
+	"github.com/fastone-open/go-storage/services"
 	"github.com/fastone-open/go-storage/types"
 )
 
-var _ types.Servicer = &BucketService{}
+func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store types.Storager, err error) {
+	// ServicePairCreate requires location, so we don't need to add location into pairs
+	// pairs := append(opt.pairs, ps.WithName(name))
+	st, err := s.newStorage(name)
+	if err != nil {
+		return
+	}
 
-type BucketService struct {
-	types.UnimplementedServicer
-	sync.RWMutex
-	buckets map[string]types.Storager
+	s.Lock()
+	defer s.Unlock()
+	s.buckets[name] = st
+	return st, nil
 }
 
-func NewBucketService() types.Servicer {
-	return &BucketService{
-		buckets: make(map[string]types.Storager),
-	}
+func (s *Service) delete(ctx context.Context, name string, opt pairServiceDelete) (err error) {
+	s.Lock()
+	defer s.Unlock()
+	delete(s.buckets, name)
+	return nil
 }
 
-func (m *BucketService) String() string {
-	return "BucketService"
-}
-func (m *BucketService) Create(name string, pairs ...types.Pair) (store types.Storager, err error) {
-	m.Lock()
-	defer m.Unlock()
-	if _, found := m.buckets[name]; found {
-		return nil, errors.New("bucket already exists")
+func (s *Service) formatError(op string, err error, name string) error {
+	if err == nil {
+		return nil
+	}
+
+	return services.ServiceError{
+		Op:       op,
+		Err:      formatError(err),
+		Servicer: s,
+		Name:     name,
 	}
-	sto, err := NewStorager(pairs...)
-	m.buckets[name] = sto
-	return sto, err
-}
-func (m *BucketService) CreateWithContext(ctx context.Context, name string, pairs ...types.Pair) (store types.Storager, err error) {
-	return m.Create(name, pairs...)
 }
-func (m *BucketService) Delete(name string, pairs ...types.Pair) (err error) {
-	m.Lock()
-	defer m.Unlock()
-	delete(m.buckets, name)
-	return nil
+
+func (s *Service) get(ctx context.Context, name string, opt pairServiceGet) (store types.Storager, err error) {
+	store, err = s.newStorage(name)
+	if err != nil {
+		return
+	}
+	return
 }
-func (m *BucketService) DeleteWithContext(ctx context.Context, name string, pairs ...types.Pair) (err error) {
-	return m.Delete(name, pairs...)
+
+func (s *Service) list(ctx context.Context, opt pairServiceList) (it *types.StoragerIterator, err error) {
+	return types.NewStoragerIterator(ctx, s.nextStoragePage, nil), nil
 }
-func (m *BucketService) Get(name string, pairs ...types.Pair) (store types.Storager, err error) {
-	m.RLock()
-	defer m.RUnlock()
-	if sto, found := m.buckets[name]; found {
-		return sto, nil
+
+func (s *Service) newStorage(name string) (store *Storage, err error) {
+	s.Lock()
+	defer s.Unlock()
+	store, ok := s.buckets[name]
+	if ok {
+		return store, nil
+	}
+
+	store = &Storage{
+		f:       s.f,
+		workDir: path.Join(s.f.WorkDir, name),
 	}
-	return nil, errors.New("bucket not found")
+	return store, nil
 }
-func (m *BucketService) GetWithContext(ctx context.Context, name string, pairs ...types.Pair) (store types.Storager, err error) {
-	return m.Get(name, pairs...)
+
+func (s *Service) nextStoragePage(ctx context.Context, page *types.StoragerPage) error {
+	for name := range s.buckets {
+		store, err := s.newStorage(name)
+		if err != nil {
+			return err
+		}
+		page.Data = append(page.Data, store)
+	}
+
+	return types.IterateDone
 }

services/memory/service.go

@@ -1,9 +1,11 @@
 package tests
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/fastone-open/go-storage/services"
 	"github.com/fastone-open/go-storage/types"
 
 	"github.com/fastone-open/go-storage/services/memory"
@@ -26,3 +28,12 @@ func TestService(t *testing.T) {
 	require.NoError(t, err)
 	t.Log(store)
 }
+
+func TestService2(t *testing.T) {
+	servicer, err := services.NewServicerFromString("memory:///mock/?credential=hmac::&endpoint=")
+	require.NoError(t, err)
+	store, err := servicer.Create("demo")
+	require.NoError(t, err)
+	t.Log(store)
+
+}