Update grpc to 1.62.0 #152
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
Signed-off-by: Rainer Schoenberger <[email protected]>
Signed-off-by: Rainer Schoenberger <[email protected]>
Signed-off-by: Rainer Schoenberger <[email protected]>
Signed-off-by: Rainer Schoenberger <[email protected]>
Signed-off-by: Rainer Schoenberger <[email protected]>
rainerschoe
commented
Feb 22, 2024
| @@ -27,6 +27,7 @@ | |||
| #include <optional> | |||
| // END MODIFIED | |||
|
|
|||
There was a problem hiding this comment.
I took the most recent cli_call.cc and cli_call.hfrom gRPC example source code and adapted it again for our needs (they had some minor updates).
rainerschoe
commented
Feb 22, 2024
| Warning: Failed to parse JSON file '-': INVALID_ARGUMENT:Unexpected end of string. Expected , or } after key:value pair. | ||
|
|
||
| ^ | ||
| /Warning: Failed to parse JSON file '-': .* |
There was a problem hiding this comment.
protobuf error message changed slightly. made the test more flexible
rainerschoe
commented
Feb 22, 2024
| @@ -64,6 +64,7 @@ Possible Candidates: | |||
| 127.0.0.1 examples.StreamingRpcs (uni- and bi-directional streams) | |||
| 127.0.0.1 examples.StatusHandling (gRPC error handling) | |||
| /^127.0.0.1 grpc.reflection.*$ | |||
| /^127.0.0.1 grpc.reflection.*$ | |||
There was a problem hiding this comment.
in latest version, grpc server adds two reflection services (one stable and one alpha)
rainerschoe
commented
Feb 22, 2024
| @@ -87,7 +91,7 @@ if(GWHISPER_FORCE_BUILDING_GRPC OR GRPC_NOT_FOUND) | |||
| if(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") | |||
| set(gRPC_SSL_PROVIDER "package" CACHE STRING "force overwritten by gWhisper, as boringSSL does not support s390x -> need to fall-back to system installed libssl" FORCE ) | |||
| endif() | |||
|
|
|||
| set(ABSL_PROPAGATE_CXX_STD ON CACHE STRING "force overwritten by gWhisper to conform to Abseil recommendations" FORCE ) | |||
There was a problem hiding this comment.
A build warning was given to set this. So setting here.
ja66
reviewed
Feb 23, 2024
src/libCli/MessageFormatterJson.cpp
Outdated
| google::protobuf::util::Status status = google::protobuf::util::MessageToJsonString(f_message, &resultString, printOptions); | ||
|
|
||
| auto status = google::protobuf::util::MessageToJsonString(f_message, &resultString, printOptions); |
src/libCli/MessageParserJson.cpp
Outdated
Comment on lines
57
to
59
| std::string fileContent = buffer.str(); | ||
| auto status = google::protobuf::util::JsonStringToMessage( | ||
| google::protobuf::StringPiece(fileContent), | ||
| fileContent, |
There was a problem hiding this comment.
Actually you don't need a temporay (fileContent) here, you could pass it directly as parameter to JsonStringToMessage()
Signed-off-by: Rainer Schoenberger <[email protected]>
ja66
approved these changes
Feb 26, 2024
|
Thanks Jens for reporting and reviewing 🥇 |
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 #151
The previously used gRPC version had build errors with more modern compilers.
Stepping to the most recent release.