aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislusf <chris.lu@gmail.com>2015-04-16 13:27:13 -0700
committerchrislusf <chris.lu@gmail.com>2015-04-16 13:27:13 -0700
commite736963f3c91972e05a9944d08ebc00096211c24 (patch)
tree53b0fa266aacd2d7ed1de37c5624f3dce59821ba
parent4d1ccf3e1053ea0067d46fc83d379b13e0ebb8b4 (diff)
parent03d99503bbb39d21083af17d484c050eeaaf9d5a (diff)
downloadseaweedfs-e736963f3c91972e05a9944d08ebc00096211c24.tar.xz
seaweedfs-e736963f3c91972e05a9944d08ebc00096211c24.zip
Merge pull request #119 from stuartpb/fix-namesapce
Fix flat_namespace_filer.go implementing "FlatNamesapceFiler"
-rw-r--r--go/filer/flat_namespace/flat_namespace_filer.go22
-rw-r--r--go/weed/weed_server/filer_server.go4
2 files changed, 13 insertions, 13 deletions
diff --git a/go/filer/flat_namespace/flat_namespace_filer.go b/go/filer/flat_namespace/flat_namespace_filer.go
index c4eff3ce1..9959b2924 100644
--- a/go/filer/flat_namespace/flat_namespace_filer.go
+++ b/go/filer/flat_namespace/flat_namespace_filer.go
@@ -6,7 +6,7 @@ import (
"github.com/chrislusf/seaweedfs/go/filer"
)
-type FlatNamesapceFiler struct {
+type FlatNamespaceFiler struct {
master string
store FlatNamespaceStore
}
@@ -15,36 +15,36 @@ var (
ErrNotImplemented = errors.New("Not Implemented for flat namespace meta data store")
)
-func NewFlatNamesapceFiler(master string, store FlatNamespaceStore) *FlatNamesapceFiler {
- return &FlatNamesapceFiler{
+func NewFlatNamespaceFiler(master string, store FlatNamespaceStore) *FlatNamespaceFiler {
+ return &FlatNamespaceFiler{
master: master,
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)
}
-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)
}
-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
}
-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
}
-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
}
-func (filer *FlatNamesapceFiler) DeleteDirectory(dirPath string, recursive bool) (err error) {
+func (filer *FlatNamespaceFiler) DeleteDirectory(dirPath string, recursive bool) (err error) {
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)
}
-func (filer *FlatNamesapceFiler) Move(fromPath string, toPath string) error {
+func (filer *FlatNamespaceFiler) Move(fromPath string, toPath string) error {
return ErrNotImplemented
}
diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go
index 48e4e5173..616f11022 100644
--- a/go/weed/weed_server/filer_server.go
+++ b/go/weed/weed_server/filer_server.go
@@ -44,10 +44,10 @@ func NewFilerServer(r *http.ServeMux, port int, master string, dir string, colle
if err != nil {
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 != "" {
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 {
if fs.filer, err = embedded_filer.NewFilerEmbedded(master, dir); err != nil {
glog.Fatalf("Can not start filer in dir %s : %v", dir, err)