Skip to content
This repository has been archived by the owner on Oct 19, 2021. It is now read-only.

storage: Add appender support #12

Merged
merged 11 commits into from
May 7, 2021
Merged

storage: Add appender support #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af05fe7
Add appender support
Apr 27, 2021
612dc3f
add object mode check and metadata description
Apr 28, 2021
fc8562a
fix the return value of writeAppend and object mode after commitAppend
JinnyYi Apr 29, 2021
4775daf
add UnimplementAppender
JinnyYi Apr 29, 2021
d0beb89
set append offset in createAppend
JinnyYi Apr 29, 2021
eaa8a7d
Idempotent storager delete operation
JinnyYi May 6, 2021
147637c
modify delete error type
JinnyYi May 7, 2021
3966191
modify the delete error check
JinnyYi May 7, 2021
b8e8f64
modify the delete error check
JinnyYi May 7, 2021
d3a35a6
modify the appender support
JinnyYi May 7, 2021
63a5e6a
modify delete error check
JinnyYi May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete

_, err = s.client.DeleteV2(input)
if err != nil {
code := files.DeleteErrorPathLookup + "/" + files.LookupErrorNotFound
if ok := checkError(err, code); !ok {
if !checkError(err, files.DeleteErrorPathLookup, files.LookupErrorNotFound) {
Copy link
Contributor

@Xuanwo Xuanwo May 7, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer:

if err != nil && checkError(err, files.DeleteErrorPathLookup, files.LookupErrorNotFound) {
    // leave comment here, refer to AOS-46
    err = nil
}
if err != nil {
    return err
}

return nil

return err
}
}
Expand Down
9 changes: 7 additions & 2 deletions utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,13 @@ func formatError(err error) error {
return err
}

func checkError(err error, code string) bool {
return strings.Contains(err.Error(), code)
func checkError(err error, codes ...string) bool {
var errMsg strings.Builder
JinnyYi marked this conversation as resolved.
Show resolved Hide resolved
for _, code := range codes {
errMsg.WriteString(code)
errMsg.WriteString("/")
}
return strings.Contains(err.Error(), errMsg.String())
}

func (s *Storage) getAbsPath(path string) string {
Expand Down