MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 15:33:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding error when object exists

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-01-20 19:13:57 -08:00
parent a7029206ff
commit 9260e6404a
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/storage/storage.go
View File

@ -34,6 +34,15 @@ func (self ObjectNotFound) Error() string {
return "Not Found: " + self.bucket + "#" + self.path return "Not Found: " + self.bucket + "#" + self.path
} }
type ObjectExists struct {
bucket string
key string
}
func (self ObjectExists) Error() string {
return "Object exists: " + self.bucket + "#" + self.key
}
func (storage *Storage) CopyObjectToWriter(w io.Writer, bucket string, object string) (int64, error) { func (storage *Storage) CopyObjectToWriter(w io.Writer, bucket string, object string) (int64, error) {
// TODO synchronize access // TODO synchronize access
// get object // get object
@ -47,8 +56,11 @@ func (storage *Storage) CopyObjectToWriter(w io.Writer, bucket string, object st
} }
} }
func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) { func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) error {
objectKey := bucket + ":" + key objectKey := bucket + ":" + key
if _, ok := storage.data[objectKey]; ok == true {
return ObjectExists{bucket: bucket, key: key}
}
var bytesBuffer bytes.Buffer var bytesBuffer bytes.Buffer
newObject := storedObject{} newObject := storedObject{}
if _, ok := io.Copy(&bytesBuffer, data); ok == nil { if _, ok := io.Copy(&bytesBuffer, data); ok == nil {
@ -60,6 +72,7 @@ func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) {
newObject.data = bytesBuffer.Bytes() newObject.data = bytesBuffer.Bytes()
} }
storage.data[objectKey] = newObject storage.data[objectKey] = newObject
return nil
} }
func (storage *Storage) ListObjects(bucket, prefix string, count int) []ObjectMetadata { func (storage *Storage) ListObjects(bucket, prefix string, count int) []ObjectMetadata {

7
pkg/webapi/minioapi/minioapi.go
View File

@ -105,7 +105,12 @@ func (server *minioApi) putObjectHandler(w http.ResponseWriter, req *http.Reques
vars := mux.Vars(req) vars := mux.Vars(req)
bucket := vars["bucket"] bucket := vars["bucket"]
object := vars["object"] object := vars["object"]
server.storage.StoreObject(bucket, object, req.Body) err := server.storage.StoreObject(bucket, object, req.Body)
if err != nil {
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte(err.Error()))
return
}
} }
func generateListResult(objects []mstorage.ObjectMetadata) ListResponse { func generateListResult(objects []mstorage.ObjectMetadata) ListResponse {