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

adjust function name

Browse source
This commit is contained in:
Chris Lu 2013-11-18 15:05:11 -08:00
parent 3b68711139
commit aed74b5568
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
go/storage/cdb_map.go
View file

@ -31,7 +31,7 @@ func OpenCdbMap(fileName string) (m *cdbMap, err error) {
return return
} }
if os.IsNotExist(err) { if os.IsNotExist(err) {
bn, ext := nakeFilename(fileName) bn, ext := baseFilename(fileName)
m.fn1 = bn + ".1" + ext m.fn1 = bn + ".1" + ext
if m.c1, err = cdb.Open(m.fn1); err != nil { if m.c1, err = cdb.Open(m.fn1); err != nil {
return nil, err return nil, err
@ -199,7 +199,7 @@ func DumpNeedleMapToCdb(cdbName string, nm *NeedleMap) error {
if len(fnames) == 1 { if len(fnames) == 1 {
return os.Rename(fnames[0], cdbName) return os.Rename(fnames[0], cdbName)
} }
bn, ext := nakeFilename(cdbName) bn, ext := baseFilename(cdbName)
if err = os.Rename(fnames[0], bn+".1"+ext); err != nil { if err = os.Rename(fnames[0], bn+".1"+ext); err != nil {
return err return err
} }
@ -227,7 +227,7 @@ func openTempCdb(fileName string) (cdb.AdderFunc, cdb.CloserFunc, error) {
} }
// returns filename without extension, and the extension // returns filename without extension, and the extension
func nakeFilename(fileName string) (string, string) { func baseFilename(fileName string) (string, string) {
ext := filepath.Ext(fileName) ext := filepath.Ext(fileName)
return fileName[:len(fileName)-len(ext)], ext return fileName[:len(fileName)-len(ext)], ext
} }

2
go/storage/volume.go
View file

@ -299,7 +299,7 @@ func (v *Volume) freeze() error {
} }
v.accessLock.Lock() v.accessLock.Lock()
defer v.accessLock.Unlock() defer v.accessLock.Unlock()
bn, _ := nakeFilename(v.dataFile.Name()) bn, _ := baseFilename(v.dataFile.Name())
cdbFn := bn + ".cdb" cdbFn := bn + ".cdb"
glog.V(0).Infof("converting %s to %s", nm.indexFile.Name(), cdbFn) glog.V(0).Infof("converting %s to %s", nm.indexFile.Name(), cdbFn)
err := DumpNeedleMapToCdb(cdbFn, nm) err := DumpNeedleMapToCdb(cdbFn, nm)