server: add MarshalJSON and UnmarshalJSON to UUID #25249
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
|
This change is |
Fixes cockroachdb#23842 The gogoproto specification states that certain methods need to be defined on a customtype: https://github.com/gogo/protobuf/blob/1ef32a8b9fc3f8ec940126907cedb5998f6318e4/custom_types.md#custom-type-method-signatures The lack of these JSON marshaling functions resulted in an error when the kvTxnId was not null when requesting the active txn id through the status endpoint. Release note (bug fix): Fix a bug where the sessions endpoint on the admin UI would return an error when there was an active transaction.
|
Pushed a fix to the test failures. The issue was that I was immediately casting a UUID string representation to bytes rather than delegating to |
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
May 3, 2018
25249: server: add MarshalJSON and UnmarshalJSON to UUID r=asubiotto a=asubiotto Fixes #23842 The gogoproto specification states that certain methods need to be defined on a customtype: https://github.com/gogo/protobuf/blob/1ef32a8b9fc3f8ec940126907cedb5998f6318e4/custom_types.md#custom-type-method-signatures The lack of these JSON marshaling functions resulted in an error when the kvTxnId was not null when requesting the active txn id through the status endpoint. Release note (bug fix): Fix a bug where the sessions endpoint on the admin UI would return an error when there was an active transaction. Co-authored-by: Alfonso Subiotto Marqués <alfonso@cockroachlabs.com>
Build succeeded |
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.
Fixes #23842
The gogoproto specification states that certain methods need to be
defined on a customtype:
https://github.com/gogo/protobuf/blob/1ef32a8b9fc3f8ec940126907cedb5998f6318e4/custom_types.md#custom-type-method-signatures
The lack of these JSON marshaling functions resulted in an error when
the kvTxnId was not null when requesting the active txn id through the
status endpoint.
Release note (bug fix): Fix a bug where the sessions endpoint on the
admin UI would return an error when there was an active transaction.