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

Fix SetMarshalData for PutSingle request #65

Merged
dstepanov-yadro merged 1 commit from dstepanov-yadro/frostfs-api-go:fix/put_single_request_marshal_data into master 2024-02-15 14:10:46 +00:00
Conversation 0 Commits 1 Files changed 2 +7 -6
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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 = data
r.marshalData = r.StableMarshal(nil)
} else {
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 {
fyrchik commented 2024-02-15 12:44:31 +00:00
Review
Copy link

How is this related?

How is this related?
dstepanov-yadro commented 2024-02-15 13:34:04 +00:00
Review
Copy link

Now r.marshalData can be nil

func (r *PutSingleRequestBody) SetMarshalData(data []byte) {
	if r == nil {
		return
	}

	r.marshalData = data

	proto.NestedStructureSetMarshalData(putSingleReqObjectField, r.marshalData, r.object)
}

So if parentData == nil then we should reset nested marshalData

Now `r.marshalData` can be `nil` ``` func (r *PutSingleRequestBody) SetMarshalData(data []byte) { if r == nil { return } r.marshalData = data proto.NestedStructureSetMarshalData(putSingleReqObjectField, r.marshalData, r.object) } ``` So if `parentData == nil` then we should reset nested marshalData
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)