package/gofakes3
1
0
Fork 0
mirror of https://github.com/alist-org/gofakes3.git synced 2025-12-24 12:58:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename DeleteResult to MultiDeleteResult for clarity

Browse Source
This commit is contained in:
shabbyrobe
2019-02-17 23:48:59 +11:00
parent f5faf45f7e
commit 249528d206
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend.go
View File

@@ -126,7 +126,7 @@ type Backend interface {
// gofakes3.ReadAll() for this job rather than ioutil.ReadAll().
PutObject(bucketName, key string, meta map[string]string, input io.Reader, size int64) error
DeleteMulti(bucketName string, objects ...string) (DeleteResult, error)
DeleteMulti(bucketName string, objects ...string) (MultiDeleteResult, error)
}
// VersionedBackend may be optionally implemented by a Backend in order to support

2
backend/s3afero/multi.go
View File

@@ -456,7 +456,7 @@ func (db *MultiBucketBackend) deleteObjectLocked(bucketName, objectName string)
return nil
}
func (db *MultiBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, rerr error) {
func (db *MultiBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, rerr error) {
db.lock.Lock()
defer db.lock.Unlock()

2
backend/s3afero/single.go
View File

@@ -332,7 +332,7 @@ func (db *SingleBucketBackend) PutObject(bucketName, objectName string, meta map
return nil
}
func (db *SingleBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, rerr error) {
func (db *SingleBucketBackend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, rerr error) {
if bucketName != db.name {
return result, gofakes3.BucketNotFound(bucketName)
}

2
backend/s3bolt/backend.go
View File

@@ -322,7 +322,7 @@ func (db *Backend) DeleteObject(bucketName, objectName string) (result gofakes3.
})
}
func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, err error) {
func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, err error) {
err = db.bolt.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(bucketName))
if b == nil {

2
backend/s3mem/backend.go
View File

@@ -222,7 +222,7 @@ func (db *Backend) DeleteObject(bucketName, objectName string) (result gofakes3.
return result, nil
}
func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.DeleteResult, err error) {
func (db *Backend) DeleteMulti(bucketName string, objects ...string) (result gofakes3.MultiDeleteResult, err error) {
db.lock.Lock()
defer db.lock.Unlock()

9
messages.go
View File

@@ -115,13 +115,14 @@ type DeleteRequest struct {
Quiet bool `xml:"Quiet"`
}
// DeleteResult contains the response from a multi delete operation.
type DeleteResult struct {
// MultiDeleteResult contains the response from a multi delete operation.
type MultiDeleteResult struct {
XMLName xml.Name `xml:"DeleteResult"`
Deleted []ObjectID `xml:"Deleted"`
Error []ErrorResult `xml:",omitempty"`
}
func (d DeleteResult) AsError() error {
func (d MultiDeleteResult) AsError() error {
if len(d.Error) == 0 {
return nil
}
@@ -129,7 +130,7 @@ func (d DeleteResult) AsError() error {
for _, er := range d.Error {
strs = append(strs, er.String())
}
return fmt.Errorf("delete failed:\n%s", strings.Join(strs, "\n"))
return fmt.Errorf("gofakes3: multi delete failed:\n%s", strings.Join(strs, "\n"))
}
type ErrorResult struct {