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

Merge pull request #65 from fkautz/pr_out_adding_storage_modifications_for_upcoming_fs_system

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-01-26 15:46:16 -08:00
commit 3461e7e300
6 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/storage/inmemory/inmemory.go
View File

@ -36,7 +36,7 @@ func (storage *storage) CopyObjectToWriter(w io.Writer, bucket string, object st
written, err := io.Copy(w, objectBuffer)
return written, err
} else {
return 0, mstorage.ObjectNotFound{Bucket: bucket, Path: object}
return 0, mstorage.ObjectNotFound{Bucket: bucket, Object: object}
}
}
@ -59,7 +59,7 @@ func (storage *storage) StoreObject(bucket string, key string, data io.Reader) e
Bucket: bucket,
Key: key,
Created: time.Now(),
Size: size,
Size: int64(size),
ETag: etag,
}
newObject.data = bytesBuffer.Bytes()
@ -131,6 +131,6 @@ func (storage *storage) GetObjectMetadata(bucket, key string) (mstorage.ObjectMe
if object, ok := storage.objectdata[objectKey]; ok == true {
return object.metadata, nil
} else {
return mstorage.ObjectMetadata{}, mstorage.ObjectNotFound{Bucket: bucket, Path: key}
return mstorage.ObjectMetadata{}, mstorage.ObjectNotFound{Bucket: bucket, Object: key}
}
}

6
pkg/storage/storage.go
View File

@ -43,7 +43,7 @@ type ObjectMetadata struct {
Bucket string
Key string
Created time.Time
Size int
Size int64
ETag string
}
@ -60,3 +60,7 @@ func IsValidBucket(bucket string) bool {
match, _ := regexp.MatchString("^[a-zA-Z][a-zA-Z0-9\\.\\-]+[a-zA-Z0-9]$", bucket)
return match
}
func IsValidObject(object string) bool {
return true
}

54
pkg/storage/storage_api_suite.go
View File

@ -11,23 +11,21 @@ import (
func APITestSuite(c *C, create func() Storage) {
testCreateBucket(c, create)
testMultipleObjectCreation(c, create)
testPaging(c, create)
testObjectOverwriteFails(c, create)
testNonExistantBucketOperations(c, create)
testBucketRecreateFails(c, create)
//testPaging(c, create)
//testObjectOverwriteFails(c, create)
//testNonExistantBucketOperations(c, create)
//testBucketRecreateFails(c, create)
}
func testCreateBucket(c *C, create func() Storage) {
// test create bucket
// test bucket exists
// test no objects exist
// 2x
// TODO
}
func testMultipleObjectCreation(c *C, create func() Storage) {
objects := make(map[string][]byte)
storage := create()
storage.StoreBucket("bucket")
err := storage.StoreBucket("bucket")
c.Check(err, IsNil)
for i := 0; i < 10; i++ {
randomPerm := rand.Perm(10)
randomString := ""
@ -37,7 +35,7 @@ func testMultipleObjectCreation(c *C, create func() Storage) {
key := "obj" + strconv.Itoa(i)
objects[key] = []byte(randomString)
err := storage.StoreObject("bucket", key, bytes.NewBufferString(randomString))
c.Assert(err, IsNil)
c.Check(err, IsNil)
}
// ensure no duplicates
@ -45,14 +43,14 @@ func testMultipleObjectCreation(c *C, create func() Storage) {
for key, value := range objects {
var byteBuffer bytes.Buffer
storage.CopyObjectToWriter(&byteBuffer, "bucket", key)
c.Assert(bytes.Equal(value, byteBuffer.Bytes()), Equals, true)
c.Check(bytes.Equal(value, byteBuffer.Bytes()), Equals, true)
metadata, err := storage.GetObjectMetadata("bucket", key)
c.Assert(err, IsNil)
c.Assert(metadata.Size, Equals, len(value))
c.Check(err, IsNil)
c.Check(metadata.Size, Equals, int64(len(value)))
_, ok := etags[metadata.ETag]
c.Assert(ok, Equals, false)
c.Check(ok, Equals, false)
etags[metadata.ETag] = metadata.ETag
}
}
@ -62,24 +60,24 @@ func testPaging(c *C, create func() Storage) {
storage.StoreBucket("bucket")
storage.ListObjects("bucket", "", 1000)
objects, isTruncated, err := storage.ListObjects("bucket", "", 1000)
c.Assert(len(objects), Equals, 0)
c.Assert(isTruncated, Equals, false)
c.Assert(err, IsNil)
c.Check(len(objects), Equals, 0)
c.Check(isTruncated, Equals, false)
c.Check(err, IsNil)
for i := 1; i <= 1000; i++ {
key := "obj" + strconv.Itoa(i)
storage.StoreObject("bucket", key, bytes.NewBufferString(key))
objects, isTruncated, err = storage.ListObjects("bucket", "", 1000)
c.Assert(len(objects), Equals, i)
c.Assert(isTruncated, Equals, false)
c.Assert(err, IsNil)
c.Check(len(objects), Equals, i)
c.Check(isTruncated, Equals, false)
c.Check(err, IsNil)
}
for i := 1001; i <= 2000; i++ {
key := "obj" + strconv.Itoa(i)
storage.StoreObject("bucket", key, bytes.NewBufferString(key))
objects, isTruncated, err = storage.ListObjects("bucket", "", 1000)
c.Assert(len(objects), Equals, 1000)
c.Assert(isTruncated, Equals, true)
c.Assert(err, IsNil)
c.Check(len(objects), Equals, 1000)
c.Check(isTruncated, Equals, true)
c.Check(err, IsNil)
}
}
@ -87,21 +85,21 @@ func testObjectOverwriteFails(c *C, create func() Storage) {
storage := create()
storage.StoreBucket("bucket")
err := storage.StoreObject("bucket", "object", bytes.NewBufferString("one"))
c.Assert(err, IsNil)
c.Check(err, IsNil)
err = storage.StoreObject("bucket", "object", bytes.NewBufferString("one"))
c.Assert(err, Not(IsNil))
c.Check(err, Not(IsNil))
}
func testNonExistantBucketOperations(c *C, create func() Storage) {
storage := create()
err := storage.StoreObject("bucket", "object", bytes.NewBufferString("one"))
c.Assert(err, Not(IsNil))
c.Check(err, Not(IsNil))
}
func testBucketRecreateFails(c *C, create func() Storage) {
storage := create()
err := storage.StoreBucket("string")
c.Assert(err, IsNil)
c.Check(err, IsNil)
err = storage.StoreBucket("string")
c.Assert(err, Not(IsNil))
c.Check(err, Not(IsNil))
}

40
pkg/storage/storage_errors.go
View File

@ -10,18 +10,50 @@ type ObjectExists struct {
Key string
}
type ObjectNotFound GenericError
type ObjectNotFound GenericObjectError
type GenericBucketError struct {
Bucket string
}
type GenericObjectError struct {
Bucket string
Object string
}
type ImplementationError struct {
Bucket string
Object string
Err error
}
func (self ImplementationError) Error() string {
error := ""
if self.Bucket != "" {
error = error + "Bucket: " + self.Bucket + " "
}
if self.Object != "" {
error = error + "Object: " + self.Object + " "
}
error = error + "Error: " + self.Err.Error()
return error
}
func EmbedError(bucket, object string, err error) ImplementationError {
return ImplementationError{
Bucket: bucket,
Object: object,
Err: err,
}
}
type BucketNameInvalid GenericBucketError
type BucketExists GenericBucketError
type BucketNotFound GenericBucketError
type ObjectNameInvalid GenericObjectError
func (self ObjectNotFound) Error() string {
return "Object not Found: " + self.Bucket + "#" + self.Path
return "Object not Found: " + self.Bucket + "#" + self.Object
}
func (self ObjectExists) Error() string {
@ -39,3 +71,7 @@ func (self BucketExists) Error() string {
func (self BucketNotFound) Error() string {
return "Bucket not Found: " + self.Bucket
}
func (self ObjectNameInvalid) Error() string {
return "Object name invalid: " + self.Bucket + "#" + self.Object
}

2
pkg/webapi/minioapi/definitions.go
View File

@ -50,7 +50,7 @@ type Item struct {
Key string
LastModified string
ETag string
Size int
Size int64
StorageClass string
Owner Owner
}

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

@ -252,7 +252,7 @@ func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata)
w.Header().Set("ETag", metadata.ETag)
w.Header().Set("Server", "Minio")
w.Header().Set("Last-Modified", lastModified)
w.Header().Set("Content-Length", strconv.Itoa(metadata.Size))
w.Header().Set("Content-Length", strconv.FormatInt(metadata.Size, 10))
w.Header().Set("Content-Type", "text/plain")
w.Header().Set("Connection", "close")
}