haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-08-10 03:08:56 +00:00
Code Issues Releases Wiki Activity

Don't use cache when merge

Browse Source
This commit is contained in:
杨赫然 2022-12-06 17:04:44 +08:00
parent b936ee1eb1
commit 079a8b65a5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fileserver/merge.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"io"
"path/filepath" "path/filepath"
"sort" "sort"
"strings" "strings"
@ -17,7 +16,6 @@ type mergeOptions struct {
remoteHead string remoteHead string
mergedRoot string mergedRoot string
conflict bool conflict bool
reader io.ReadCloser
} }
func mergeTrees(storeID string, roots []string, opt *mergeOptions) error { func mergeTrees(storeID string, roots []string, opt *mergeOptions) error {
@ -28,7 +26,7 @@ func mergeTrees(storeID string, roots []string, opt *mergeOptions) error {
var trees []*fsmgr.SeafDir var trees []*fsmgr.SeafDir
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
dir, err := fsmgr.GetSeafdirWithZlibReader(storeID, roots[i], opt.reader) dir, err := fsmgr.GetSeafdir(storeID, roots[i])
if err != nil { if err != nil {
err := fmt.Errorf("failed to get dir: %v", err) err := fmt.Errorf("failed to get dir: %v", err)
return err return err
@ -290,7 +288,7 @@ func mergeDirectories(storeID string, dents []*fsmgr.SeafDirent, baseDir string,
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
if dents[i] != nil && fsmgr.IsDir(dents[i].Mode) { if dents[i] != nil && fsmgr.IsDir(dents[i].Mode) {
dir, err := fsmgr.GetSeafdirWithZlibReader(storeID, dents[i].ID, opt.reader) dir, err := fsmgr.GetSeafdir(storeID, dents[i].ID)
if err != nil { if err != nil {
err := fmt.Errorf("failed to get seafdir %s/%s", storeID, dents[i].ID) err := fmt.Errorf("failed to get seafdir %s/%s", storeID, dents[i].ID)
return nil, err return nil, err