gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119 from stuartpb/fix-namesapce

Browse source 
Fix flat_namespace_filer.go implementing "FlatNamesapceFiler"
This commit is contained in:
chrislusf 2015-04-16 13:27:13 -07:00
parent 4d1ccf3e10 03d99503bb
commit e736963f3c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
go/filer/flat_namespace/flat_namespace_filer.go
View file

@ -6,7 +6,7 @@ import (
"github.com/chrislusf/seaweedfs/go/filer" "github.com/chrislusf/seaweedfs/go/filer"
) )
type FlatNamesapceFiler struct { type FlatNamespaceFiler struct {
master string master string
store FlatNamespaceStore store FlatNamespaceStore
} }
@ -15,36 +15,36 @@ var (
ErrNotImplemented = errors.New("Not Implemented for flat namespace meta data store") ErrNotImplemented = errors.New("Not Implemented for flat namespace meta data store")
) )
func NewFlatNamesapceFiler(master string, store FlatNamespaceStore) *FlatNamesapceFiler { func NewFlatNamespaceFiler(master string, store FlatNamespaceStore) *FlatNamespaceFiler {
return &FlatNamesapceFiler{ return &FlatNamespaceFiler{
master: master, master: master,
store: store, store: store,
} }
} }
func (filer *FlatNamesapceFiler) CreateFile(fullFileName string, fid string) (err error) { func (filer *FlatNamespaceFiler) CreateFile(fullFileName string, fid string) (err error) {
return filer.store.Put(fullFileName, fid) return filer.store.Put(fullFileName, fid)
} }
func (filer *FlatNamesapceFiler) FindFile(fullFileName string) (fid string, err error) { func (filer *FlatNamespaceFiler) FindFile(fullFileName string) (fid string, err error) {
return filer.store.Get(fullFileName) return filer.store.Get(fullFileName)
} }
func (filer *FlatNamesapceFiler) FindDirectory(dirPath string) (dirId filer.DirectoryId, err error) { func (filer *FlatNamespaceFiler) FindDirectory(dirPath string) (dirId filer.DirectoryId, err error) {
return 0, ErrNotImplemented return 0, ErrNotImplemented
} }
func (filer *FlatNamesapceFiler) ListDirectories(dirPath string) (dirs []filer.DirectoryEntry, err error) { func (filer *FlatNamespaceFiler) ListDirectories(dirPath string) (dirs []filer.DirectoryEntry, err error) {
return nil, ErrNotImplemented return nil, ErrNotImplemented
} }
func (filer *FlatNamesapceFiler) ListFiles(dirPath string, lastFileName string, limit int) (files []filer.FileEntry, err error) { func (filer *FlatNamespaceFiler) ListFiles(dirPath string, lastFileName string, limit int) (files []filer.FileEntry, err error) {
return nil, ErrNotImplemented return nil, ErrNotImplemented
} }
func (filer *FlatNamesapceFiler) DeleteDirectory(dirPath string, recursive bool) (err error) { func (filer *FlatNamespaceFiler) DeleteDirectory(dirPath string, recursive bool) (err error) {
return ErrNotImplemented return ErrNotImplemented
} }
func (filer *FlatNamesapceFiler) DeleteFile(fullFileName string) (fid string, err error) { func (filer *FlatNamespaceFiler) DeleteFile(fullFileName string) (fid string, err error) {
return filer.store.Delete(fullFileName) return filer.store.Delete(fullFileName)
} }
func (filer *FlatNamesapceFiler) Move(fromPath string, toPath string) error { func (filer *FlatNamespaceFiler) Move(fromPath string, toPath string) error {
return ErrNotImplemented return ErrNotImplemented
} }

4
go/weed/weed_server/filer_server.go
View file

@ -44,10 +44,10 @@ func NewFilerServer(r *http.ServeMux, port int, master string, dir string, colle
if err != nil { if err != nil {
glog.Fatalf("Can not connect to cassandra server %s with keyspace %s: %v", cassandra_server, cassandra_keyspace, err) glog.Fatalf("Can not connect to cassandra server %s with keyspace %s: %v", cassandra_server, cassandra_keyspace, err)
} }
fs.filer = flat_namespace.NewFlatNamesapceFiler(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.NewFlatNamesapceFiler(master, redis_store) fs.filer = flat_namespace.NewFlatNamespaceFiler(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)