-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
perf(storage): remove protobuf's copy of data on unmarshalling #9526
Conversation
removes unmarshalling copy of all except first chunk off wire
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall looks good; just a few minor suggestions and questions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, nice work!
// wire-encoded message buffer b, or an error if the message is invalid. | ||
// This is used on the first recv of an object as it may contain all fields of | ||
// ReadObjectResponse. | ||
func readFullObjectResponse(b []byte) (*storagepb.ReadObjectResponse, error) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might want to note that this function is essentially identical to proto.Unmarshal
, except it aliases the data in the input []byte
. If we ever add a feature to Unmarshal
that does that, this function can be dropped.
storage/grpc_client.go
Outdated
} | ||
} | ||
|
||
// Unmarshal remaining fields. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're unmarshaling all the fields in the message, so this will be a bit more efficient if you loop once over the fields rather than looking up each individually:
off := 0
for off < len(b) {
num, typ, n := protowire.ConsumeTag(b[off:])
if n < 0 {
return nil, protowire.ParseError(n)
}
off += n
switch {
case num == checksummedDataField && typ == protowire.BytesType:
// unmarshal the checksummed_data field
case num == objectChecksumsField && typ == protowire.BytesType:
// unmarshal the object_checksums field
case num == contentRangeField && typ == protowire.BytesType:
// unmarshal the content_range field
case num == metadataField && typ == protowire.BytesType:
// unmarshal the metadata field
default:
n = protowire.ConsumeFieldValue(num, typ, b[off:])
if n < 0 {
return nil, protowire.ParseError(n)
}
off += n
}
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion!
🤖 I have created a release *beep* *boop* --- ## [1.40.0](https://togithub.com/googleapis/google-cloud-go/compare/storage/v1.39.1...storage/v1.40.0) (2024-03-29) ### Features * **storage:** Implement io.WriterTo in Reader ([#9659](https://togithub.com/googleapis/google-cloud-go/issues/9659)) ([8264a96](https://togithub.com/googleapis/google-cloud-go/commit/8264a962d1c21d52e8fca50af064c5535c3708d3)) * **storage:** New storage control client ([#9631](https://togithub.com/googleapis/google-cloud-go/issues/9631)) ([1f4d279](https://togithub.com/googleapis/google-cloud-go/commit/1f4d27957743878976d6b4549cc02a5bb894d330)) ### Bug Fixes * **storage:** Retry errors from last recv on uploads ([#9616](https://togithub.com/googleapis/google-cloud-go/issues/9616)) ([b6574aa](https://togithub.com/googleapis/google-cloud-go/commit/b6574aa42ebad0532c2749b6ece879b932f95cb9)) * **storage:** Update protobuf dep to v1.33.0 ([30b038d](https://togithub.com/googleapis/google-cloud-go/commit/30b038d8cac0b8cd5dd4761c87f3f298760dd33a)) ### Performance Improvements * **storage:** Remove protobuf's copy of data on unmarshalling ([#9526](https://togithub.com/googleapis/google-cloud-go/issues/9526)) ([81281c0](https://togithub.com/googleapis/google-cloud-go/commit/81281c04e503fd83301baf88cc352c77f5d476ca)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
googleapis#9526)" This reverts commit 81281c0. Also updates grpc-go to use new default codec
Note that this could be made even more efficient by parsing the whole block at once instead of reusing the
readProtoBytes
function, which will look at and then skip over the fields that have already been parsed.readProtoBytes
calls protowire functions that do some calculations that re-slice the data buffer, without any copies. So, I don't think the improvement would be noticeable, especially since we only have 4 fields in the message. The cpu flame graphs do not show this function, so whatever time is spent there seems to be negligible.cc: @dfawley