gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

sorting chunks

Browse source
This commit is contained in:
Chris Lu 2020-08-23 00:00:36 -07:00
parent 5e6b714836
commit d60bcbf08a
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/filer2/filechunks.go
View file

@ -219,7 +219,7 @@ func NonOverlappingVisibleIntervals(lookupFileIdFn LookupFileIdFunctionType, chu
chunks, _, err = ResolveChunkManifest(lookupFileIdFn, chunks) chunks, _, err = ResolveChunkManifest(lookupFileIdFn, chunks)
sort.Slice(chunks, func(i, j int) bool { sort.Slice(chunks, func(i, j int) bool {
return chunks[i].Mtime < chunks[j].Mtime return chunks[i].Fid.FileKey < chunks[j].Fid.FileKey
}) })
var newVisibles []VisibleInterval var newVisibles []VisibleInterval

2
weed/filesys/file.go
View file

@ -258,7 +258,7 @@ func (file *File) maybeLoadEntry(ctx context.Context) error {
func (file *File) addChunks(chunks []*filer_pb.FileChunk) { func (file *File) addChunks(chunks []*filer_pb.FileChunk) {
sort.Slice(chunks, func(i, j int) bool { sort.Slice(chunks, func(i, j int) bool {
return chunks[i].Mtime < chunks[j].Mtime return chunks[i].Fid.FileKey < chunks[j].Fid.FileKey
}) })
var newVisibles []filer2.VisibleInterval var newVisibles []filer2.VisibleInterval

8
weed/shell/command_fs_meta_cat.go
View file

@ -3,6 +3,7 @@ package shell
import ( import (
"fmt" "fmt"
"io" "io"
"sort"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
@ -54,6 +55,13 @@ func (c *commandFsMetaCat) Do(args []string, commandEnv *CommandEnv, writer io.W
Indent: " ", Indent: " ",
} }
sort.Slice(respLookupEntry.Entry.Chunks, func(i, j int) bool {
if respLookupEntry.Entry.Chunks[i].Offset == respLookupEntry.Entry.Chunks[j].Offset {
return respLookupEntry.Entry.Chunks[i].Mtime < respLookupEntry.Entry.Chunks[j].Mtime
}
return respLookupEntry.Entry.Chunks[i].Offset < respLookupEntry.Entry.Chunks[j].Offset
})
text, marshalErr := m.MarshalToString(respLookupEntry.Entry) text, marshalErr := m.MarshalToString(respLookupEntry.Entry)
if marshalErr != nil { if marshalErr != nil {
return fmt.Errorf("marshal meta: %v", marshalErr) return fmt.Errorf("marshal meta: %v", marshalErr)