TrueCloudLab/frostfs-api-go
22
0
Fork 16
Code Issues 10 Pull requests 2 Projects Releases Activity Actions

[#65] object: Fix SetMarshalData for PutSingle request

Browse source 
Allow to reset marshal data

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2024-02-15 15:38:48 +03:00 committed by Evgenii Stratonikov
parent e4ac613c8e
commit 6d3ade7848
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
object/marshal.go
View file

@ -1111,17 +1111,13 @@ func (r *PutSingleRequestBody) StableMarshal(buf []byte) []byte {
// SetMarshalData sets marshal data to reduce memory allocations. // SetMarshalData sets marshal data to reduce memory allocations.
// //
// It is unsafe to modify request data after setting marshal data. // It is unsafe to modify/copy request data after setting marshal data.
func (r *PutSingleRequestBody) SetMarshalData(data []byte) { func (r *PutSingleRequestBody) SetMarshalData(data []byte) {
if r == nil { if r == nil {
return return
} }
if data == nil {
r.marshalData = r.StableMarshal(nil)
} else {
r.marshalData = data r.marshalData = data
}
proto.NestedStructureSetMarshalData(putSingleReqObjectField, r.marshalData, r.object) proto.NestedStructureSetMarshalData(putSingleReqObjectField, r.marshalData, r.object)
} }

5
util/proto/marshal.go
View file

@ -287,6 +287,11 @@ func NestedStructureSetMarshalData[T any, M setMarshalData[T]](field int64, pare
return 0 return 0
} }
if parentData == nil {
v.SetMarshalData(nil)
return 0
}
n := v.StableSize() n := v.StableSize()
buf := make([]byte, binary.MaxVarintLen64) buf := make([]byte, binary.MaxVarintLen64)
prefix := protowire.EncodeTag(protowire.Number(field), protowire.BytesType) prefix := protowire.EncodeTag(protowire.Number(field), protowire.BytesType)