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 #315 from 030io/master

Browse source 
fix bug: filer DELETE
This commit is contained in:
Chris Lu 2016-06-10 10:53:55 -07:00 committed by GitHub
parent e416679cea fa2a7b5f2f
commit f6d75476b9
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
weed/filer/cassandra_store/cassandra_store.go
View file

@ -68,16 +68,16 @@ func (c *CassandraStore) Get(fullFileName string) (fid string, err error) {
} }
// Currently the fid is not returned // Currently the fid is not returned
func (c *CassandraStore) Delete(fullFileName string) (fid string, err error) { func (c *CassandraStore) Delete(fullFileName string) (err error) {
if err := c.session.Query( if err := c.session.Query(
`DELETE FROM seaweed_files WHERE path = ?`, `DELETE FROM seaweed_files WHERE path = ?`,
fullFileName).Exec(); err != nil { fullFileName).Exec(); err != nil {
if err != gocql.ErrNotFound { if err != gocql.ErrNotFound {
glog.V(0).Infof("Failed to delete file %s: %v", fullFileName, err) glog.V(0).Infof("Failed to delete file %s: %v", fullFileName, err)
} }
return "", err return err
} }
return "", nil return nil
} }
func (c *CassandraStore) Close() { func (c *CassandraStore) Close() {

14
weed/filer/flat_namespace/flat_namespace_filer.go
View file

@ -42,7 +42,19 @@ func (filer *FlatNamespaceFiler) DeleteDirectory(dirPath string, recursive bool)
} }
func (filer *FlatNamespaceFiler) DeleteFile(fullFileName string) (fid string, err error) { func (filer *FlatNamespaceFiler) DeleteFile(fullFileName string) (fid string, err error) {
return filer.store.Delete(fullFileName) fid, err = filer.FindFile(fullFileName)
if err != nil {
return "", err
}
err = filer.store.Delete(fullFileName)
if err != nil {
return "", err
}
return fid, nil
//return filer.store.Delete(fullFileName)
//are you kidding me!!!!
} }
func (filer *FlatNamespaceFiler) Move(fromPath string, toPath string) error { func (filer *FlatNamespaceFiler) Move(fromPath string, toPath string) error {

2
weed/filer/flat_namespace/flat_namespace_store.go
View file

@ -5,5 +5,5 @@ import ()
type FlatNamespaceStore interface { type FlatNamespaceStore interface {
Put(fullFileName string, fid string) (err error) Put(fullFileName string, fid string) (err error)
Get(fullFileName string) (fid string, err error) Get(fullFileName string) (fid string, err error)
Delete(fullFileName string) (fid string, err error) Delete(fullFileName string) (err error)
} }

4
weed/filer/redis_store/redis_store.go
View file

@ -33,12 +33,12 @@ func (s *RedisStore) Put(fullFileName string, fid string) (err error) {
} }
// Currently the fid is not returned // Currently the fid is not returned
func (s *RedisStore) Delete(fullFileName string) (fid string, err error) { func (s *RedisStore) Delete(fullFileName string) (err error) {
_, err = s.Client.Del(fullFileName).Result() _, err = s.Client.Del(fullFileName).Result()
if err == redis.Nil { if err == redis.Nil {
err = nil err = nil
} }
return "", err return err
} }
func (s *RedisStore) Close() { func (s *RedisStore) Close() {