github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-20 07:45:33 +00:00
Code Issues Projects Releases Wiki Activity

storagedriver/s3: Updating the directoryDiff naming and replace sort with reverse

Browse Source
This commit is contained in:
Collin Shoop 2021-06-29 17:13:45 -04:00
parent b9b0cac122
commit d257d6ce28
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
registry/storage/driver/s3-aws/s3.go
View File

@ -1193,10 +1193,10 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
// Eg 5 directoryDiff("/", "/path/to/folder/folder/file") // Eg 5 directoryDiff("/", "/path/to/folder/folder/file")
// => [ "/path", "/path/to", "/path/to/folder", "/path/to/folder/folder" ], // => [ "/path", "/path/to", "/path/to/folder", "/path/to/folder/folder" ],
func directoryDiff(prev, current string) []string { func directoryDiff(prev, current string) []string {
var parents []string var paths []string
if prev == "" || current == "" { if prev == "" || current == "" {
return parents return paths
} }
parent := current parent := current
@ -1205,10 +1205,16 @@ func directoryDiff(prev, current string) []string {
if parent == "/" || parent == prev || strings.HasPrefix(prev, parent) { if parent == "/" || parent == prev || strings.HasPrefix(prev, parent) {
break break
} }
parents = append(parents, parent) paths = append(paths, parent)
}
reverse(paths)
return paths
}
func reverse(s []string) {
for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {
s[i], s[j] = s[j], s[i]
} }
sort.Sort(sort.StringSlice(parents))
return parents
} }
func (d *driver) s3Path(path string) string { func (d *driver) s3Path(path string) string {