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

storage.ObjectStorage List() is now List(objectPath string)

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2014-12-15 15:55:35 +13:00
parent 16e92521bd
commit 5efc0d54f8
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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")
}