fix: get a diff only when in debug #55
Merged
Conversation
This file contains 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
julienrbrt
approved these changes
Mar 30, 2023
proto/merge.go
Outdated
| @@ -100,7 +100,7 @@ func mergedFileDescriptors(debug bool) (*descriptorpb.FileDescriptorSet, error) | |||
| // If there's a mismatch, we log a warning. If there was no | |||
| // mismatch, then we do nothing, and take the protoregistry file | |||
| // descriptor as the correct one. | |||
| if !protov2.Equal(protodesc.ToFileDescriptorProto(protoregFd), fd) { | |||
| if !protov2.Equal(protodesc.ToFileDescriptorProto(protoregFd), fd) && debug { | |||
There was a problem hiding this comment.
Oh, I understand now what you meant on Slack. The diff isn't printed anyway, because it is printed only on debug... So even before that we did not have a way to easily call debug from the SDK.
Maybe in a follow-up we should add an option in proto.MergedRegistry() to call DebugFileDescriptorsMismatch instead of MergedFileDescriptors? This way we can handle the display of the debug directly in the SDK.
|
Needs a changelog as well. |
julienrbrt
changed the title
julienrbrt
force-pushed
the
facu/fix-nondebug-time
branch
from
c78ce25
to
8d22e1e
Compare
amaury1093
approved these changes
Mar 30, 2023
There was a problem hiding this comment.
This makes sense @facundomedica, sorry for missing that in my original PR. Thanks!
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When running with
debug=falsecalculating diffs make no sense given that they are not going to be printed. This was causing a lot of time being spent here for no reasonref: cosmos/cosmos-sdk#15594