MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 22:55:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of errors.Join for go1.19 compat (#18243)

Browse Source
This commit is contained in:
Aditya Manthramurthy 2023-10-13 15:14:16 -07:00 committed by GitHub
parent f5b04865f4
commit b3e7de010d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/erasure-object.go
View File

@ -489,6 +489,24 @@ func auditDanglingObjectDeletion(ctx context.Context, bucket, object, versionID
auditLogInternal(ctx, opts) auditLogInternal(ctx, opts)
} }
func joinErrors(errs ...error) error {
s := make([]string, 0, len(errs))
nonNilErrs := make([]any, 0, len(errs))
for _, err := range errs {
if err == nil {
continue
}
s = append(s, "[%w]")
nonNilErrs = append(nonNilErrs, err)
}
// If all the errors were nil, return nil.
if len(nonNilErrs) == 0 {
return nil
}
allErrs := strings.Join(s, "\n")
return fmt.Errorf(allErrs, nonNilErrs...)
}
func (er erasureObjects) deleteIfDangling(ctx context.Context, bucket, object string, metaArr []FileInfo, errs []error, dataErrs []error, opts ObjectOptions) (FileInfo, error) { func (er erasureObjects) deleteIfDangling(ctx context.Context, bucket, object string, metaArr []FileInfo, errs []error, dataErrs []error, opts ObjectOptions) (FileInfo, error) {
_, file, line, cok := runtime.Caller(1) _, file, line, cok := runtime.Caller(1)
var err error var err error
@ -497,8 +515,8 @@ func (er erasureObjects) deleteIfDangling(ctx context.Context, bucket, object st
tags := make(map[string]interface{}, 4) tags := make(map[string]interface{}, 4)
tags["set"] = er.setIndex tags["set"] = er.setIndex
tags["pool"] = er.poolIndex tags["pool"] = er.poolIndex
tags["merrs"] = errors.Join(errs...) tags["merrs"] = joinErrors(errs...) // errors.Join(errs...)
tags["derrs"] = errors.Join(dataErrs...) tags["derrs"] = joinErrors(dataErrs...) // errors.Join(dataErrs...)
if m.IsValid() { if m.IsValid() {
tags["size"] = m.Size tags["size"] = m.Size
tags["mtime"] = m.ModTime.Format(http.TimeFormat) tags["mtime"] = m.ModTime.Format(http.TimeFormat)