Browse Source

make a new interface for distributed full function filer

pull/254/head
zhaozhi 10 years ago
parent
commit
9ea0d1a93e
  1. 42
      go/filer/distributed_filer/distributed_filer.go
  2. 15
      go/filer/distributed_filer/distributed_store.go
  3. 3
      go/weed/weed_server/filer_server.go

42
go/filer/distributed_filer/distributed_filer.go

@ -0,0 +1,42 @@
package distributed_filer
import "github.com/chrislusf/seaweedfs/go/filer"
type DistributedFiler struct {
master string
store DistributedStore
}
func NewDistributedFiler(master string, store DistributedStore) *DistributedFiler {
return &DistributedFiler{
master: master,
store: store,
}
}
func (filer *DistributedFiler) CreateFile(fullFileName string, fid string) (err error) {
return filer.store.Put(fullFileName, fid)
}
func (filer *DistributedFiler) FindFile(fullFileName string) (fid string, err error) {
return filer.store.Get(fullFileName)
}
func (filer *DistributedFiler) FindDirectory(dirPath string) (dirId filer.DirectoryId, err error) {
return filer.store.FindDirectory(dirPath)
}
func (filer *DistributedFiler) ListDirectories(dirPath string) (dirs []filer.DirectoryEntry, err error) {
return filer.store.ListDirectories(dirPath)
}
func (filer *DistributedFiler) ListFiles(dirPath string, lastFileName string, limit int) (files []filer.FileEntry, err error) {
return filer.store.ListFiles(dirPath, lastFileName, limit)
}
func (filer *DistributedFiler) DeleteDirectory(dirPath string, recursive bool) (err error) {
return filer.store.DeleteDirectory(dirPath, recursive)
}
func (filer *DistributedFiler) DeleteFile(fullFileName string) (fid string, err error) {
return filer.store.Delete(fullFileName)
}
func (filer *DistributedFiler) Move(fromPath string, toPath string) error {
return filer.store.Move(fromPath, toPath)
}

15
go/filer/distributed_filer/distributed_store.go

@ -0,0 +1,15 @@
package distributed_filer
import "github.com/chrislusf/seaweedfs/go/filer"
type DistributedStore interface {
Put(fullFileName string, fid string) (err error)
Get(fullFileName string) (fid string, err error)
Delete(fullFileName string) (fid string, err error)
FindDirectory(dirPath string) (dirId filer.DirectoryId, err error)
ListDirectories(dirPath string) (dirs []filer.DirectoryEntry, err error)
ListFiles(dirPath string, lastFileName string, limit int) (files []filer.FileEntry, err error)
DeleteDirectory(dirPath string, recursive bool) (err error)
Move(fromPath string, toPath string) error
}

3
go/weed/weed_server/filer_server.go

@ -6,6 +6,7 @@ import (
"github.com/chrislusf/seaweedfs/go/filer" "github.com/chrislusf/seaweedfs/go/filer"
"github.com/chrislusf/seaweedfs/go/filer/cassandra_store" "github.com/chrislusf/seaweedfs/go/filer/cassandra_store"
"github.com/chrislusf/seaweedfs/go/filer/distributed_filer"
"github.com/chrislusf/seaweedfs/go/filer/embedded_filer" "github.com/chrislusf/seaweedfs/go/filer/embedded_filer"
"github.com/chrislusf/seaweedfs/go/filer/flat_namespace" "github.com/chrislusf/seaweedfs/go/filer/flat_namespace"
"github.com/chrislusf/seaweedfs/go/filer/redis_store" "github.com/chrislusf/seaweedfs/go/filer/redis_store"
@ -47,7 +48,7 @@ func NewFilerServer(r *http.ServeMux, port int, master string, dir string, colle
fs.filer = flat_namespace.NewFlatNamespaceFiler(master, cassandra_store) fs.filer = flat_namespace.NewFlatNamespaceFiler(master, cassandra_store)
} else if redis_server != "" { } else if redis_server != "" {
redis_store := redis_store.NewRedisStore(redis_server, redis_database) redis_store := redis_store.NewRedisStore(redis_server, redis_database)
fs.filer = flat_namespace.NewFlatNamespaceFiler(master, redis_store)
fs.filer = distributed_filer.NewDistributedFiler(master, redis_store)
} else { } else {
if fs.filer, err = embedded_filer.NewFilerEmbedded(master, dir); err != nil { if fs.filer, err = embedded_filer.NewFilerEmbedded(master, dir); err != nil {
glog.Fatalf("Can not start filer in dir %s : %v", dir, err) glog.Fatalf("Can not start filer in dir %s : %v", dir, err)

Loading…
Cancel
Save