mailru: skip extra http request if data fits in hash

s3-about
Ivan Andreev 2019-09-10 21:16:35 +03:00 committed by Nick Craig-Wood
parent 8fb44a822d
commit 8fe87c8157
1 changed files with 19 additions and 14 deletions

View File

@ -1581,23 +1581,28 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
}
var (
fileBuf []byte
fileHash []byte
newHash []byte
fileBuf []byte
fileHash []byte
newHash []byte
trySpeedup bool
)
// Request hash from source
if srcHash, err := src.Hash(ctx, hash.Mailru); err == nil && srcHash != "" {
fileHash, _ = mrhash.DecodeString(srcHash)
}
// Try speedup method if it's globally enabled and source hash is available
trySpeedup := o.fs.opt.SpeedupEnable
if trySpeedup && fileHash != nil {
if o.putByHash(ctx, fileHash, src, "source") {
return nil
// Don't disturb the source if file fits in hash.
// Skip an extra speedup request if file fits in hash.
if size > mrhash.Size {
// Request hash from source.
if srcHash, err := src.Hash(ctx, hash.Mailru); err == nil && srcHash != "" {
fileHash, _ = mrhash.DecodeString(srcHash)
}
// Try speedup if it's globally enabled and source hash is available.
trySpeedup = o.fs.opt.SpeedupEnable
if trySpeedup && fileHash != nil {
if o.putByHash(ctx, fileHash, src, "source") {
return nil
}
trySpeedup = false // speedup failed, force upload
}
trySpeedup = false // speedup failed, force upload
}
// Need to calculate hash, check whether file is still eligible for speedup