MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #649 from harshavardhana/pr_out_minor_optimization_avoiding_one_unnecessary_copy 

Minor optimization avoiding one unnecessary copy
This commit is contained in:
Harshavardhana 2015-06-11 14:26:18 -07:00
parent 609c587a27 636788997b
commit da593b498c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/storage/drivers/memory/memory.go
View File

@ -277,18 +277,18 @@ func (memory *memoryDriver) createObject(bucket, key, contentType, expectedMD5Su
if err != io.EOF { if err != io.EOF {
return "", iodine.New(err, nil) return "", iodine.New(err, nil)
} }
go debug.FreeOSMemory()
md5SumBytes := hash.Sum(nil) md5SumBytes := hash.Sum(nil)
totalLength := len(readBytes) totalLength := len(readBytes)
memory.lock.Lock() memory.lock.Lock()
ok := memory.objects.Set(objectKey, readBytes) ok := memory.objects.Set(objectKey, readBytes)
// setting up for de-allocation
readBytes = nil
go debug.FreeOSMemory()
memory.lock.Unlock() memory.lock.Unlock()
if !ok { if !ok {
return "", iodine.New(drivers.InternalError{}, nil) return "", iodine.New(drivers.InternalError{}, nil)
} }
// setting up for de-allocation
readBytes = nil
md5Sum := hex.EncodeToString(md5SumBytes) md5Sum := hex.EncodeToString(md5SumBytes)
// Verify if the written object is equal to what is expected, only if it is requested as such // Verify if the written object is equal to what is expected, only if it is requested as such

10
pkg/storage/drivers/memory/memory_multipart.go
View File

@ -244,9 +244,8 @@ func (memory *memoryDriver) CompleteMultipartUpload(bucket, key, uploadID string
memory.lock.Unlock() memory.lock.Unlock()
return "", iodine.New(errors.New("missing part: "+strconv.Itoa(i)), nil) return "", iodine.New(errors.New("missing part: "+strconv.Itoa(i)), nil)
} }
obj := object size += int64(len(object))
size += int64(len(obj)) calcMD5Bytes := md5.Sum(object)
calcMD5Bytes := md5.Sum(obj)
// complete multi part request header md5sum per part is hex encoded // complete multi part request header md5sum per part is hex encoded
recvMD5Bytes, err := hex.DecodeString(strings.Trim(recvMD5, "\"")) recvMD5Bytes, err := hex.DecodeString(strings.Trim(recvMD5, "\""))
if err != nil { if err != nil {
@ -255,10 +254,12 @@ func (memory *memoryDriver) CompleteMultipartUpload(bucket, key, uploadID string
if !bytes.Equal(recvMD5Bytes, calcMD5Bytes[:]) { if !bytes.Equal(recvMD5Bytes, calcMD5Bytes[:]) {
return "", iodine.New(drivers.BadDigest{Md5: recvMD5, Bucket: bucket, Key: getMultipartKey(key, uploadID, i)}, nil) return "", iodine.New(drivers.BadDigest{Md5: recvMD5, Bucket: bucket, Key: getMultipartKey(key, uploadID, i)}, nil)
} }
_, err = io.Copy(&fullObject, bytes.NewBuffer(obj)) _, err = io.Copy(&fullObject, bytes.NewBuffer(object))
if err != nil { if err != nil {
return "", iodine.New(err, nil) return "", iodine.New(err, nil)
} }
object = nil
go debug.FreeOSMemory()
} }
memory.lock.Unlock() memory.lock.Unlock()
@ -271,6 +272,7 @@ func (memory *memoryDriver) CompleteMultipartUpload(bucket, key, uploadID string
// which would in-turn cleanup properly in accordance with S3 Spec // which would in-turn cleanup properly in accordance with S3 Spec
return "", iodine.New(err, nil) return "", iodine.New(err, nil)
} }
fullObject.Reset()
memory.cleanupMultiparts(bucket, key, uploadID) memory.cleanupMultiparts(bucket, key, uploadID)
memory.cleanupMultipartSession(bucket, key, uploadID) memory.cleanupMultipartSession(bucket, key, uploadID)
return etag, nil return etag, nil