diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-06-22 20:04:56 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-06-22 20:04:56 -0700 |
| commit | 3fa1f150d9644056344b8ca822254de8fcbd203b (patch) | |
| tree | dca95c0f5e17491697d476b1a0ef62fd8fbb2535 /weed/server | |
| parent | 1babec00e70fc194fa40951162db907cf0e363cd (diff) | |
| download | seaweedfs-3fa1f150d9644056344b8ca822254de8fcbd203b.tar.xz seaweedfs-3fa1f150d9644056344b8ca822254de8fcbd203b.zip | |
refactoring
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index bcac4dbde..f8bb9cf07 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -140,7 +140,7 @@ func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntr } // remove old chunks if not included in the new ones - unusedChunks := filer2.FindUnusedFileChunks(entry.Chunks, req.Entry.Chunks) + unusedChunks := filer2.MinusChunks(entry.Chunks, req.Entry.Chunks) chunks, garbages := filer2.CompactFileChunks(req.Entry.Chunks) diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 1d18bd75e..c7cb4f0cc 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -78,7 +78,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, func (fs *FilerServer) handleSingleChunk(w http.ResponseWriter, r *http.Request, entry *filer2.Entry) { - fileId := entry.Chunks[0].FileId + fileId := entry.Chunks[0].GetFileIdString() urlString, err := fs.filer.MasterClient.LookupFileId(fileId) if err != nil { |