MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from fkautz/pr_out_storage_objectstorage_list_is_now_list_objectpath_string

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2014-12-15 19:32:09 +13:00
commit e3af681cc1
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/erasure-demo/erasure.go
View File

@ -11,14 +11,14 @@ import (
es "github.com/minio-io/minio/pkgs/storage/encodedstorage"
)
func erasureGetList(config inputConfig) (io.Reader, error) {
func erasureGetList(config inputConfig, objectPath string) (io.Reader, error) {
var objectStorage storage.ObjectStorage
rootDir := path.Join(config.rootDir, config.storageDriver)
objectStorage, err := es.NewStorage(rootDir, config.k, config.m, config.blockSize)
if err != nil {
return nil, err
}
objectDescList, err := objectStorage.List()
objectDescList, err := objectStorage.List(objectPath)
if err != nil {
return nil, err
}

2
cmd/erasure-demo/get.go
View File

@ -20,7 +20,7 @@ func get(c *cli.Context) {
case "erasure":
{
if len(objectName) == 0 {
if objectReader, err = erasureGetList(config); err != nil {
if objectReader, err = erasureGetList(config, ""); err != nil {
log.Fatal(err)
}
} else {

15
pkgs/storage/appendstorage/append_storage.go
View File

@ -25,6 +25,7 @@ import (
"os"
"path"
"strconv"
"strings"
"github.com/minio-io/minio/pkgs/checksum/crc32c"
"github.com/minio-io/minio/pkgs/storage"
@ -133,14 +134,16 @@ func (aStorage *appendStorage) Put(objectPath string, object io.Reader) error {
return nil
}
func (aStorage *appendStorage) List() ([]storage.ObjectDescription, error) {
func (aStorage *appendStorage) List(objectPath string) ([]storage.ObjectDescription, error) {
var objectDescList []storage.ObjectDescription
for objectName, _ := range aStorage.objects {
var objectDescription storage.ObjectDescription
objectDescription.Name = objectName
objectDescription.Md5sum = ""
objectDescription.Murmur3 = ""
objectDescList = append(objectDescList, objectDescription)
if strings.HasPrefix(objectName, objectPath) {
var objectDescription storage.ObjectDescription
objectDescription.Name = objectName
objectDescription.Md5sum = ""
objectDescription.Murmur3 = ""
objectDescList = append(objectDescList, objectDescription)
}
}
if len(objectDescList) == 0 {
return nil, errors.New("No objects found")

16
pkgs/storage/encodedstorage/encoded_storage.go
View File

@ -27,6 +27,7 @@ import (
"os"
"path"
"strconv"
"strings"
"github.com/minio-io/minio/pkgs/erasure"
"github.com/minio-io/minio/pkgs/split"
@ -116,15 +117,16 @@ func (eStorage *encodedStorage) Get(objectPath string) (io.Reader, error) {
return reader, nil
}
func (eStorage *encodedStorage) List() ([]storage.ObjectDescription, error) {
func (eStorage *encodedStorage) List(objectPath string) ([]storage.ObjectDescription, error) {
var objectDescList []storage.ObjectDescription
for objectName, objectEntry := range eStorage.objects {
var objectDescription storage.ObjectDescription
//protectionLevel := strconv.Itoa(objectEntry.Encoderparams.K) + "," + strconv.Itoa(objectEntry.Encoderparams.M)
objectDescription.Name = objectName
objectDescription.Md5sum = hex.EncodeToString(objectEntry.Md5sum)
objectDescription.Murmur3 = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescList = append(objectDescList, objectDescription)
if strings.HasPrefix(objectName, objectPath) {
var objectDescription storage.ObjectDescription
objectDescription.Name = objectName
objectDescription.Md5sum = hex.EncodeToString(objectEntry.Md5sum)
objectDescription.Murmur3 = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescList = append(objectDescList, objectDescription)
}
}
if len(objectDescList) == 0 {
return nil, errors.New("No objects found")

2
pkgs/storage/encodedstorage/encoded_storage_test.go
View File

@ -35,7 +35,7 @@ func (s *EncodedStorageSuite) TestFileStoragePutAtRootPath(c *C) {
object1, _ := ioutil.ReadAll(objectResult1)
c.Assert(string(object1), Equals, "object1")
objectList, err := objectStorage.List()
objectList, err := objectStorage.List("")
c.Assert(err, IsNil)
c.Assert(objectList[0].Name, Equals, "path1")
}

2
pkgs/storage/storage.go
View File

@ -3,7 +3,7 @@ package storage
import "io"
type ObjectStorage interface {
List() ([]ObjectDescription, error)
List(objectPath string) ([]ObjectDescription, error)
Get(path string) (io.Reader, error)
Put(path string, object io.Reader) error
}