From dd7cd11c9ca4a0e51c27f2c14434a07a23a092c0 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Mon, 15 Dec 2014 14:26:16 +1300 Subject: [PATCH] ObjectDescription is now more exact, only exposes necessary details. --- pkgs/storage/appendstorage/append_storage.go | 3 +-- pkgs/storage/encodedstorage/encoded_storage.go | 5 ++--- pkgs/storage/fsstorage/fs_storage.go | 3 +-- pkgs/storage/storage.go | 7 +++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/storage/appendstorage/append_storage.go b/pkgs/storage/appendstorage/append_storage.go index b5fe1079c..fbf570ecd 100644 --- a/pkgs/storage/appendstorage/append_storage.go +++ b/pkgs/storage/appendstorage/append_storage.go @@ -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 { diff --git a/pkgs/storage/encodedstorage/encoded_storage.go b/pkgs/storage/encodedstorage/encoded_storage.go index 1e01092e1..eb180664e 100644 --- a/pkgs/storage/encodedstorage/encoded_storage.go +++ b/pkgs/storage/encodedstorage/encoded_storage.go @@ -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 { diff --git a/pkgs/storage/fsstorage/fs_storage.go b/pkgs/storage/fsstorage/fs_storage.go index b84c6fa61..c59d6606f 100644 --- a/pkgs/storage/fsstorage/fs_storage.go +++ b/pkgs/storage/fsstorage/fs_storage.go @@ -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 { diff --git a/pkgs/storage/storage.go b/pkgs/storage/storage.go index fbbffd5a5..4e3465ad1 100644 --- a/pkgs/storage/storage.go +++ b/pkgs/storage/storage.go @@ -10,8 +10,7 @@ type ObjectStorage interface { } type ObjectDescription struct { - Name string - Md5sum string - Protectionlevel string - Hash string + Name string + Md5sum string + Murmur3 string }