Merge pull request #315 from 030io/master

fix bug: filer DELETE

weed/filer/cassandra_store/cassandra_store.go

@@ -68,16 +68,16 @@ func (c *CassandraStore) Get(fullFileName string) (fid string, err error) {
 }
 
 // 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(
 		`DELETE FROM seaweed_files WHERE path = ?`,
 		fullFileName).Exec(); err != nil {
 		if err != gocql.ErrNotFound {
 			glog.V(0).Infof("Failed to delete file %s: %v", fullFileName, err)
 		}
-		return "", err
+		return err
 	}
-	return "", nil
+	return nil
 }
 
 func (c *CassandraStore) Close() {

weed/filer/flat_namespace/flat_namespace_filer.go

@@ -42,7 +42,19 @@ func (filer *FlatNamespaceFiler) DeleteDirectory(dirPath string, recursive bool)
 }
 
 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 {

weed/filer/flat_namespace/flat_namespace_store.go

@@ -5,5 +5,5 @@ import ()
 type FlatNamespaceStore interface {
 	Put(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)
 }

weed/filer/redis_store/redis_store.go

@@ -33,12 +33,12 @@ func (s *RedisStore) Put(fullFileName string, fid string) (err error) {
 }
 
 // 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()
 	if err == redis.Nil {
 		err = nil
 	}
-	return "", err
+	return err
 }
 
 func (s *RedisStore) Close() {