aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2014-04-17 22:32:21 -0700
committerChris Lu <chris.lu@gmail.com>2014-04-17 22:32:21 -0700
commite378f9892d1535702c49cb145f6fc06c561acef0 (patch)
treed7c06fe81835ee13bab30f31744f78fc13f27f7a
parent3ee017d3502d5cd3de54b60f6bde95ffd2f27aea (diff)
downloadseaweedfs-e378f9892d1535702c49cb145f6fc06c561acef0.tar.xz
seaweedfs-e378f9892d1535702c49cb145f6fc06c561acef0.zip
Avoid showing the first directory when listing the root directory
-rw-r--r--go/filer/directory_in_map.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go
index 4a900d4ed..d288f3502 100644
--- a/go/filer/directory_in_map.go
+++ b/go/filer/directory_in_map.go
@@ -26,8 +26,7 @@ type DirectoryManagerInMap struct {
}
func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryInMap, name string) (d *DirectoryEntryInMap) {
- d = &DirectoryEntryInMap{Name: name, Parent: parent}
- d.SubDirectories = make(map[string]*DirectoryEntryInMap)
+ d = &DirectoryEntryInMap{Name: name, Parent: parent, SubDirectories: make(map[string]*DirectoryEntryInMap)}
dm.max++
d.Id = dm.max
parts := make([]string, 0)
@@ -53,7 +52,8 @@ func (dm *DirectoryManagerInMap) log(words ...string) {
func NewDirectoryManagerInMap(dirLogFile string) (dm *DirectoryManagerInMap, err error) {
dm = &DirectoryManagerInMap{}
- dm.Root = dm.NewDirectoryEntryInMap(nil, "")
+ //dm.Root do not use NewDirectoryEntryInMap, since dm.max will be changed
+ dm.Root = &DirectoryEntryInMap{SubDirectories: make(map[string]*DirectoryEntryInMap)}
if dm.logFile, err = os.OpenFile(dirLogFile, os.O_RDWR|os.O_CREATE, 0644); err != nil {
return nil, fmt.Errorf("cannot write directory log file %s.idx: %s", dirLogFile, err.Error())
}