MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-03 07:10:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use convenience functions for url.Values over looping through keys, fix a bug in listObjectParts()

Browse Source
This commit is contained in:
Harshavardhana 2015-05-10 11:30:03 -07:00
parent 62f20c0f79
commit b48b7f51ef
3 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/api_object_handlers.go
View File

@ -305,15 +305,8 @@ func (server *minioAPI) putObjectPartHandler(w http.ResponseWriter, req *http.Re
bucket := vars["bucket"] bucket := vars["bucket"]
object := vars["object"] object := vars["object"]
var uploadID, partIDString string uploadID := req.URL.Query().Get("uploadId")
for key, value := range req.URL.Query() { partIDString := req.URL.Query().Get("partNumber")
switch true {
case key == "uploadId":
uploadID = value[0]
case key == "partNumber":
partIDString = value[0]
}
}
partID, err := strconv.Atoi(partIDString) partID, err := strconv.Atoi(partIDString)
if err != nil { if err != nil {

35
pkg/api/resources.go
View File

@ -25,37 +25,20 @@ import (
// parse bucket url queries // parse bucket url queries
func getBucketResources(values url.Values) (v drivers.BucketResourcesMetadata) { func getBucketResources(values url.Values) (v drivers.BucketResourcesMetadata) {
for key, value := range values { v.Prefix = values.Get("prefix")
switch true { v.Marker = values.Get("marker")
case key == "prefix": v.Maxkeys, _ = strconv.Atoi(values.Get("max-keys"))
v.Prefix = value[0] v.Delimiter = values.Get("delimiter")
case key == "marker": v.EncodingType = values.Get("encoding-type")
v.Marker = value[0]
case key == "max-keys":
v.Maxkeys, _ = strconv.Atoi(value[0])
case key == "delimiter":
v.Delimiter = value[0]
case key == "encoding-type":
v.EncodingType = value[0]
}
}
return return
} }
// parse object url queries // parse object url queries
func getObjectResources(values url.Values) (v drivers.ObjectResourcesMetadata) { func getObjectResources(values url.Values) (v drivers.ObjectResourcesMetadata) {
for key, value := range values { v.UploadID = values.Get("uploadId")
switch true { v.PartNumberMarker, _ = strconv.Atoi(values.Get("part-number-marker"))
case key == "uploadId": v.MaxParts, _ = strconv.Atoi(values.Get("max-parts"))
v.UploadID = value[0] v.EncodingType = values.Get("encoding-type")
case key == "part-number-marker":
v.PartNumberMarker, _ = strconv.Atoi(value[0])
case key == "max-parts":
v.MaxParts, _ = strconv.Atoi(value[0])
case key == "encoding-type":
v.EncodingType = value[0]
}
}
return return
} }

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

@ -299,7 +299,7 @@ func (memory *memoryDriver) createObject(bucket, key, contentType, expectedMD5Su
memory.lock.Lock() memory.lock.Lock()
memoryObject := make(map[string]drivers.ObjectMetadata) memoryObject := make(map[string]drivers.ObjectMetadata)
switch { switch {
case len(memory.storedBuckets[bucket].objectMetadata) == 0: case len(storedBucket.objectMetadata) == 0:
storedBucket.objectMetadata = memoryObject storedBucket.objectMetadata = memoryObject
storedBucket.objectMetadata[objectKey] = newObject storedBucket.objectMetadata[objectKey] = newObject
default: default:
@ -591,6 +591,7 @@ func (memory *memoryDriver) CreateObjectPart(bucket, key, uploadID string, partI
multiPartSession := storedBucket.multiPartSession[key] multiPartSession := storedBucket.multiPartSession[key]
multiPartSession.totalParts++ multiPartSession.totalParts++
storedBucket.multiPartSession[key] = multiPartSession storedBucket.multiPartSession[key] = multiPartSession
return etag, nil return etag, nil
} }
@ -715,7 +716,7 @@ func (memory *memoryDriver) ListObjectParts(bucket, key string, resources driver
objectResourcesMetadata.NextPartNumberMarker = i objectResourcesMetadata.NextPartNumberMarker = i
return objectResourcesMetadata, nil return objectResourcesMetadata, nil
} }
object, ok := storedBucket.objectMetadata[resources.Bucket+"/"+getMultipartKey(resources.Key, resources.UploadID, i)] object, ok := storedBucket.objectMetadata[bucket+"/"+getMultipartKey(key, resources.UploadID, i)]
if !ok { if !ok {
return drivers.ObjectResourcesMetadata{}, iodine.New(errors.New("missing part: "+strconv.Itoa(i)), nil) return drivers.ObjectResourcesMetadata{}, iodine.New(errors.New("missing part: "+strconv.Itoa(i)), nil)
} }