02-protobuf-1.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. diff --git a/src/cpp/ext/proto_server_reflection.cc b/src/cpp/ext/proto_server_reflection.cc
  2. index f26f007..ceca602 100644
  3. --- a/src/cpp/ext/proto_server_reflection.cc
  4. +++ b/src/cpp/ext/proto_server_reflection.cc
  5. @@ -94,7 +94,7 @@ Status ProtoServerReflection::ServerReflectionInfo(
  6. void ProtoServerReflection::FillErrorResponse(const Status& status,
  7. ErrorResponse* error_response) {
  8. error_response->set_error_code(status.error_code());
  9. - error_response->set_error_message(status.error_message());
  10. + error_response->set_error_message(TProtoStringType(status.error_message()));
  11. }
  12. Status ProtoServerReflection::ListService(ServerContext* /*context*/,
  13. @@ -104,7 +104,7 @@ Status ProtoServerReflection::ListService(ServerContext* /*context*/,
  14. }
  15. for (const auto& value : *services_) {
  16. ServiceResponse* service_response = response->add_service();
  17. - service_response->set_name(value);
  18. + service_response->set_name(TProtoStringType(value));
  19. }
  20. return Status::OK;
  21. }
  22. @@ -116,7 +116,7 @@ Status ProtoServerReflection::GetFileByName(
  23. }
  24. const protobuf::FileDescriptor* file_desc =
  25. - descriptor_pool_->FindFileByName(file_name);
  26. + descriptor_pool_->FindFileByName(TProtoStringType(file_name));
  27. if (file_desc == nullptr) {
  28. return Status(StatusCode::NOT_FOUND, "File not found.");
  29. }
  30. @@ -134,7 +134,7 @@ Status ProtoServerReflection::GetFileContainingSymbol(
  31. }
  32. const protobuf::FileDescriptor* file_desc =
  33. - descriptor_pool_->FindFileContainingSymbol(symbol);
  34. + descriptor_pool_->FindFileContainingSymbol(TProtoStringType(symbol));
  35. if (file_desc == nullptr) {
  36. return Status(StatusCode::NOT_FOUND, "Symbol not found.");
  37. }
  38. @@ -175,7 +175,7 @@ Status ProtoServerReflection::GetAllExtensionNumbers(
  39. }
  40. const protobuf::Descriptor* desc =
  41. - descriptor_pool_->FindMessageTypeByName(type);
  42. + descriptor_pool_->FindMessageTypeByName(TProtoStringType(type));
  43. if (desc == nullptr) {
  44. return Status(StatusCode::NOT_FOUND, "Type not found.");
  45. }
  46. @@ -185,7 +185,7 @@ Status ProtoServerReflection::GetAllExtensionNumbers(
  47. for (const auto& value : extensions) {
  48. response->add_extension_number(value->number());
  49. }
  50. - response->set_base_type_name(type);
  51. + response->set_base_type_name(TProtoStringType(type));
  52. return Status::OK;
  53. }
  54. @@ -199,7 +199,7 @@ void ProtoServerReflection::FillFileDescriptorResponse(
  55. seen_files->insert(file_desc->name());
  56. protobuf::FileDescriptorProto file_desc_proto;
  57. - TString data;
  58. + TProtoStringType data;
  59. file_desc->CopyTo(&file_desc_proto);
  60. file_desc_proto.SerializeToString(&data);
  61. response->mutable_file_descriptor_response()->add_file_descriptor_proto(data);