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

Restructure and use human readable names

Browse Source
This commit is contained in:
Harshavardhana
2015-03-12 00:36:33 -07:00
parent e21020b337
commit 67888cbaa9
10 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/api/minioapi/api_test.go
View File

@@ -61,7 +61,7 @@ func (s *MySuite) TestEmptyObject(c *C) {
buffer := bytes.NewBufferString("")
storage.CreateBucket("bucket")
storage.StoreObject("bucket", "object", "", buffer)
storage.CreateObject("bucket", "object", "", buffer)
response, err := http.Get(testServer.URL + "/bucket/object")
c.Assert(err, IsNil)
@@ -86,7 +86,7 @@ func (s *MySuite) TestObject(c *C) {
buffer := bytes.NewBufferString("hello world")
storage.CreateBucket("bucket")
storage.StoreObject("bucket", "object", "", buffer)
storage.CreateObject("bucket", "object", "", buffer)
response, err := http.Get(testServer.URL + "/bucket/object")
c.Assert(err, IsNil)
@@ -112,9 +112,9 @@ func (s *MySuite) TestMultipleObjects(c *C) {
buffer3 := bytes.NewBufferString("hello three")
storage.CreateBucket("bucket")
storage.StoreObject("bucket", "object1", "", buffer1)
storage.StoreObject("bucket", "object2", "", buffer2)
storage.StoreObject("bucket", "object3", "", buffer3)
storage.CreateObject("bucket", "object1", "", buffer1)
storage.CreateObject("bucket", "object2", "", buffer2)
storage.CreateObject("bucket", "object3", "", buffer3)
// test non-existant object
response, err := http.Get(testServer.URL + "/bucket/object")
@@ -204,7 +204,7 @@ func (s *MySuite) TestHeader(c *C) {
buffer := bytes.NewBufferString("hello world")
storage.CreateBucket("bucket")
storage.StoreObject("bucket", "object", "", buffer)
storage.CreateObject("bucket", "object", "", buffer)
response, err = http.Get(testServer.URL + "/bucket/object")
c.Assert(err, IsNil)
@@ -285,7 +285,7 @@ func (s *MySuite) TestPutObject(c *C) {
var writer bytes.Buffer
storage.CopyObjectToWriter(&writer, "bucket", "two")
storage.GetObject(&writer, "bucket", "two")
c.Assert(bytes.Equal(writer.Bytes(), []byte("hello world")), Equals, true)

6
pkg/api/minioapi/object_handlers.go
View File

@@ -52,7 +52,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
switch httpRange.start == 0 && httpRange.length == 0 {
case true:
writeObjectHeaders(w, metadata)
if _, err := server.storage.CopyObjectToWriter(w, bucket, object); err != nil {
if _, err := server.storage.GetObject(w, bucket, object); err != nil {
log.Println(err)
error := errorCodeError(InternalError)
errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
@@ -64,7 +64,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
metadata.Size = httpRange.length
writeRangeObjectHeaders(w, metadata, httpRange.getContentRange())
w.WriteHeader(http.StatusPartialContent)
_, err := server.storage.CopyObjectToWriterRange(w, bucket, object, httpRange.start, httpRange.length)
_, err := server.storage.GetPartialObject(w, bucket, object, httpRange.start, httpRange.length)
if err != nil {
log.Println(err)
error := errorCodeError(InternalError)
@@ -165,7 +165,7 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
return
}
err := server.storage.StoreObject(bucket, object, "", req.Body)
err := server.storage.CreateObject(bucket, object, "", req.Body)
switch err := err.(type) {
case nil:
w.Header().Set("Server", "Minio")

2
pkg/api/minioapi/policy_handlers.go
View File

@@ -43,7 +43,7 @@ func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.
return
}
err := server.storage.StoreBucketPolicy(bucket, policy)
err := server.storage.CreateBucketPolicy(bucket, policy)
switch err := err.(type) {
case nil:
{

0
pkg/api/minioapi/muxer.go → pkg/api/minioapi/router.go
View File