aarifullin/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Pull requests Activity

[#141] sdk/client: Fix object operations

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-09-11 18:32:09 +03:00 committed by Stanislav Bogatyrev
parent 4fd6839473
commit 644a21edca
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/client/object.go
View file

@ -174,12 +174,6 @@ func (c *Client) PutObject(ctx context.Context, p *PutObjectParams, opts ...Call
} }
func (c *Client) putObjectV2(ctx context.Context, p *PutObjectParams, opts ...CallOption) (*object.ID, error) { func (c *Client) putObjectV2(ctx context.Context, p *PutObjectParams, opts ...CallOption) (*object.ID, error) {
// convert object to V2
obj, err := p.obj.ToV2(c.key)
if err != nil {
return nil, errors.Wrap(err, "could not convert object to V2")
}
// create V2 Object client // create V2 Object client
cli, err := v2ObjectClient(c.remoteNode.Protocol, c.opts) cli, err := v2ObjectClient(c.remoteNode.Protocol, c.opts)
if err != nil { if err != nil {
@ -213,6 +207,8 @@ func (c *Client) putObjectV2(ctx context.Context, p *PutObjectParams, opts ...Ca
initPart := new(v2object.PutObjectPartInit) initPart := new(v2object.PutObjectPartInit)
body.SetObjectPart(initPart) body.SetObjectPart(initPart)
obj := p.obj.ToV2()
// set init part fields // set init part fields
initPart.SetObjectID(obj.GetObjectID()) initPart.SetObjectID(obj.GetObjectID())
initPart.SetSignature(obj.GetSignature()) initPart.SetSignature(obj.GetSignature())
@ -447,12 +443,7 @@ func (c *Client) getObjectV2(ctx context.Context, p *GetObjectParams, opts ...Ca
obj.SetPayload(payload) obj.SetPayload(payload)
// convert the object // convert the object
res, err := object.FromV2(obj) return object.NewFromV2(obj), nil
if err != nil {
return nil, errors.Wrap(err, "could not convert V2 object")
}
return res, nil
} }
func (p *ObjectHeaderParams) WithAddress(v *object.Address) *ObjectHeaderParams { func (p *ObjectHeaderParams) WithAddress(v *object.Address) *ObjectHeaderParams {
@ -575,12 +566,7 @@ func (c *Client) getObjectHeaderV2(ctx context.Context, p *ObjectHeaderParams, o
obj.SetHeader(hdr) obj.SetHeader(hdr)
// convert the object // convert the object
res, err := object.FromV2(obj) return object.NewFromV2(obj), nil
if err != nil {
return nil, errors.Wrap(err, "could not convert object")
}
return res, nil
} }
func (p *RangeDataParams) WithAddress(v *object.Address) *RangeDataParams { func (p *RangeDataParams) WithAddress(v *object.Address) *RangeDataParams {