TrueCloudLab/frostfs-s3-gw
17
3
Fork 20
Code Issues 18 Pull requests 3 Projects Releases 36 Packages 1 Activity Actions

[#577] Replace ObjInfo with ExtObjInfo in cache

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-08-09 02:32:18 +04:00 • committed by Kira
parent dc77ad4863
commit 245e64900d
2 changed files with 47 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/cache/objects.go vendored
View file

@ -39,13 +39,13 @@ func New(config *Config) *ObjectsCache {
}
// GetObject returns a cached object info.
func (o *ObjectsCache) GetObject(address oid.Address) *data.ObjectInfo {
func (o *ObjectsCache) GetObject(address oid.Address) *data.ExtendedObjectInfo {
entry, err := o.cache.Get(address)
if err != nil {
return nil
}
result, ok := entry.(*data.ObjectInfo)
result, ok := entry.(*data.ExtendedObjectInfo)
if !ok {
o.logger.Warn("invalid cache entry type", zap.String("actual", fmt.Sprintf("%T", entry)),
zap.String("expected", fmt.Sprintf("%T", result)))
@ -56,8 +56,8 @@ func (o *ObjectsCache) GetObject(address oid.Address) *data.ObjectInfo {
}
// PutObject puts an object info to cache.
func (o *ObjectsCache) PutObject(obj *data.ObjectInfo) error {
return o.cache.Set(obj.Address(), obj)
func (o *ObjectsCache) PutObject(obj *data.ExtendedObjectInfo) error {
return o.cache.Set(obj.ObjectInfo.Address(), obj)
}
// Delete deletes an object from cache.