maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #124 from fkautz/pr_out_objectdescription_is_now_more_exact_only_exposes_necessary_details

Browse source 
ObjectDescription is now more exact, only exposes necessary details.
This commit is contained in:
Harshavardhana 2014-12-14 17:37:01 -08:00
parent 8ff7fea4ac dd7cd11c9c
commit 9ea907e062
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/storage/appendstorage/append_storage.go
View file

@ -139,8 +139,7 @@ func (aStorage *appendStorage) List() ([]storage.ObjectDescription, error) {
var objectDescription storage.ObjectDescription
objectDescription.Name = objectName
objectDescription.Md5sum = ""
objectDescription.Hash = ""
objectDescription.Protectionlevel = ""
objectDescription.Murmur3 = ""
objectDescList = append(objectDescList, objectDescription)
}
if len(objectDescList) == 0 {

5
pkgs/storage/encodedstorage/encoded_storage.go
View file

@ -120,11 +120,10 @@ func (eStorage *encodedStorage) List() ([]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)
//protectionLevel := strconv.Itoa(objectEntry.Encoderparams.K) + "," + strconv.Itoa(objectEntry.Encoderparams.M)
objectDescription.Name = objectName
objectDescription.Md5sum = hex.EncodeToString(objectEntry.Md5sum)
objectDescription.Hash = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescription.Protectionlevel = protectionLevel
objectDescription.Murmur3 = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescList = append(objectDescList, objectDescription)
}
if len(objectDescList) == 0 {

3
pkgs/storage/fsstorage/fs_storage.go
View file

@ -84,8 +84,7 @@ func (fsStorage *fileSystemStorage) List() ([]storage.ObjectDescription, error)
var objectDescription storage.ObjectDescription
objectDescription.Name = objectName
objectDescription.Md5sum = hex.EncodeToString(objectEntry.Md5sum)
objectDescription.Hash = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescription.Protectionlevel = ""
objectDescription.Murmur3 = strconv.FormatUint(objectEntry.Murmurhash, 16)
objectDescList = append(objectDescList, objectDescription)
}
if len(objectDescList) == 0 {

7
pkgs/storage/storage.go
View file

@ -10,8 +10,7 @@ type ObjectStorage interface {
}
type ObjectDescription struct {
Name string
Md5sum string
Protectionlevel string
Hash string
Name string
Md5sum string
Murmur3 string
}