ccl/sqlproxyccl: update PeekMsg to return message size instead of body size#76562
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Feb 15, 2022
Merged
Conversation
Member
|
This change is |
14 tasks
…y size Informs cockroachdb#76000. Follow-up to cockroachdb#76006. Previously, PeekMsg was returning the body size (excluding header size), which is a bit awkward from an API point of view because most callers of PeekMsg immediately adds the header size to the returned size previously. This commit cleans the API design up by making PeekMsg return the message size instead, i.e. header inclusive. At the same time, returning the message size makes it consistent with the ReadMsg API since that returns the entire message. Release note: None
d6348f2 to
2dfd748
Compare
jaylim-crl
commented
Feb 15, 2022
Contributor
Author
jaylim-crl
left a comment
There was a problem hiding this comment.
TFTR!
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @andy-kimball)
pkg/ccl/sqlproxyccl/interceptor/base.go, line 113 at r1 (raw file):
Previously, JeffSwenson (Jeff Swenson) wrote…
nit: Adding 1 can overflow size into a negative number. change the ErrProtocolError condition to:
if size < 4 || size == math.MaxInt {
return 0, 0, ErrProtocolError
}
This is a good catch. I checked on math.MaxInt32 instead since the data came from 4 bytes. Also added a test case for that.
Contributor
Author
|
bors r=JeffSwenson |
Contributor
|
Build succeeded: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Informs #76000. Follow-up to #76006.
Previously, PeekMsg was returning the body size (excluding header size), which
is a bit awkward from an API point of view because most callers of PeekMsg
immediately adds the header size to the returned size previously. This commit
cleans the API design up by making PeekMsg return the message size instead,
i.e. header inclusive. At the same time, returning the message size makes it
consistent with the ReadMsg API since that returns the entire message.
Release note: None