Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update csharp_generator.cc to be compatible with internal and public version of protobuf (#25514)

Browse Source 
* Update csharp_generator.cc to be compatible with internal and public proto

* Add mappings to config_protobuf.h:

* Refactor uses of MethodType

* Refactor Functions using GetMethodType

* Update for comments

* Update config_protobuf.h

* improve readability

* clang format code

Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
reviewable/pr25586/r1^2
crewmatt 4 years ago committed by GitHub
parent 65454866da
commit fe37853055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 104 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/compiler/config_protobuf.h
  2. 215
      src/compiler/csharp_generator.cc
  3. 2
      src/compiler/csharp_generator.h

10
src/compiler/config_protobuf.h
Unescape View File

@ -49,4 +49,14 @@
::google::protobuf::compiler::ParseGeneratorParameter
#endif
#ifndef GRPC_CUSTOM_CSHARP_GETCLASSNAME
#include <google/protobuf/compiler/csharp/csharp_names.h>
#define GRPC_CUSTOM_CSHARP_GETCLASSNAME \
::google::protobuf::compiler::csharp::GetClassName
#define GRPC_CUSTOM_CSHARP_GETFILENAMESPACE \
::google::protobuf::compiler::csharp::GetFileNamespace
#define GRPC_CUSTOM_CSHARP_GETREFLECTIONCLASSNAME \
::google::protobuf::compiler::csharp::GetReflectionClassName
#endif
#endif // SRC_COMPILER_CONFIG_PROTOBUF_H

215
src/compiler/csharp_generator.cc
Unescape View File

@ -25,23 +25,13 @@
#include "src/compiler/csharp_generator.h"
#include "src/compiler/csharp_generator_helpers.h"
using google::protobuf::compiler::csharp::GetClassName;
using google::protobuf::compiler::csharp::GetFileNamespace;
using google::protobuf::compiler::csharp::GetReflectionClassName;
using grpc::protobuf::Descriptor;
using grpc::protobuf::FileDescriptor;
using grpc::protobuf::MethodDescriptor;
using grpc::protobuf::ServiceDescriptor;
using grpc::protobuf::io::Printer;
using grpc::protobuf::io::StringOutputStream;
using grpc_generator::GetMethodType;
using grpc_generator::MethodType;
using grpc_generator::METHODTYPE_BIDI_STREAMING;
using grpc_generator::METHODTYPE_CLIENT_STREAMING;
using grpc_generator::METHODTYPE_NO_STREAMING;
using grpc_generator::METHODTYPE_SERVER_STREAMING;
using grpc_generator::StringReplace;
using std::map;
using std::vector;
namespace grpc_csharp_generator {
@ -184,34 +174,36 @@ std::string GetServerClassName(const ServiceDescriptor* service) {
return service->name() + "Base";
}
std::string GetCSharpMethodType(MethodType method_type) {
switch (method_type) {
case METHODTYPE_NO_STREAMING:
return "grpc::MethodType.Unary";
case METHODTYPE_CLIENT_STREAMING:
std::string GetCSharpMethodType(const MethodDescriptor* method) {
if (method->client_streaming()) {
if (method->server_streaming()) {
return "grpc::MethodType.DuplexStreaming";
} else {
return "grpc::MethodType.ClientStreaming";
case METHODTYPE_SERVER_STREAMING:
}
} else {
if (method->server_streaming()) {
return "grpc::MethodType.ServerStreaming";
case METHODTYPE_BIDI_STREAMING:
return "grpc::MethodType.DuplexStreaming";
} else {
return "grpc::MethodType.Unary";
}
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
}
std::string GetCSharpServerMethodType(MethodType method_type) {
switch (method_type) {
case METHODTYPE_NO_STREAMING:
return "grpc::UnaryServerMethod";
case METHODTYPE_CLIENT_STREAMING:
std::string GetCSharpServerMethodType(const MethodDescriptor* method) {
if (method->client_streaming()) {
if (method->server_streaming()) {
return "grpc::DuplexStreamingServerMethod";
} else {
return "grpc::ClientStreamingServerMethod";
case METHODTYPE_SERVER_STREAMING:
}
} else {
if (method->server_streaming()) {
return "grpc::ServerStreamingServerMethod";
case METHODTYPE_BIDI_STREAMING:
return "grpc::DuplexStreamingServerMethod";
} else {
return "grpc::UnaryServerMethod";
}
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
}
std::string GetServiceNameFieldName() { return "__ServiceName"; }
@ -233,7 +225,7 @@ std::string GetMethodRequestParamMaybe(const MethodDescriptor* method,
if (invocation_param) {
return "request, ";
}
return GetClassName(method->input_type()) + " request, ";
return GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + " request, ";
}
std::string GetAccessLevel(bool internal_access) {
@ -241,65 +233,50 @@ std::string GetAccessLevel(bool internal_access) {
}
std::string GetMethodReturnTypeClient(const MethodDescriptor* method) {
switch (GetMethodType(method)) {
case METHODTYPE_NO_STREAMING:
return "grpc::AsyncUnaryCall<" + GetClassName(method->output_type()) +
">";
case METHODTYPE_CLIENT_STREAMING:
if (method->client_streaming()) {
if (method->server_streaming()) {
return "grpc::AsyncDuplexStreamingCall<" +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + ", " +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">";
} else {
return "grpc::AsyncClientStreamingCall<" +
GetClassName(method->input_type()) + ", " +
GetClassName(method->output_type()) + ">";
case METHODTYPE_SERVER_STREAMING:
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + ", " +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">";
}
} else {
if (method->server_streaming()) {
return "grpc::AsyncServerStreamingCall<" +
GetClassName(method->output_type()) + ">";
case METHODTYPE_BIDI_STREAMING:
return "grpc::AsyncDuplexStreamingCall<" +
GetClassName(method->input_type()) + ", " +
GetClassName(method->output_type()) + ">";
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">";
} else {
return "grpc::AsyncUnaryCall<" +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">";
}
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
}
std::string GetMethodRequestParamServer(const MethodDescriptor* method) {
switch (GetMethodType(method)) {
case METHODTYPE_NO_STREAMING:
case METHODTYPE_SERVER_STREAMING:
return GetClassName(method->input_type()) + " request";
case METHODTYPE_CLIENT_STREAMING:
case METHODTYPE_BIDI_STREAMING:
return "grpc::IAsyncStreamReader<" + GetClassName(method->input_type()) +
"> requestStream";
if (method->client_streaming()) {
return "grpc::IAsyncStreamReader<" +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) +
"> requestStream";
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
return GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()) + " request";
}
std::string GetMethodReturnTypeServer(const MethodDescriptor* method) {
switch (GetMethodType(method)) {
case METHODTYPE_NO_STREAMING:
case METHODTYPE_CLIENT_STREAMING:
return "global::System.Threading.Tasks.Task<" +
GetClassName(method->output_type()) + ">";
case METHODTYPE_SERVER_STREAMING:
case METHODTYPE_BIDI_STREAMING:
return "global::System.Threading.Tasks.Task";
if (method->server_streaming()) {
return "global::System.Threading.Tasks.Task";
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
return "global::System.Threading.Tasks.Task<" +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) + ">";
}
std::string GetMethodResponseStreamMaybe(const MethodDescriptor* method) {
switch (GetMethodType(method)) {
case METHODTYPE_NO_STREAMING:
case METHODTYPE_CLIENT_STREAMING:
return "";
case METHODTYPE_SERVER_STREAMING:
case METHODTYPE_BIDI_STREAMING:
return ", grpc::IServerStreamWriter<" +
GetClassName(method->output_type()) + "> responseStream";
if (method->server_streaming()) {
return ", grpc::IServerStreamWriter<" +
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()) +
"> responseStream";
}
GOOGLE_LOG(FATAL) << "Can't get here.";
return "";
}
@ -396,7 +373,7 @@ void GenerateMarshallerFields(Printer* out, const ServiceDescriptor* service) {
"grpc::Marshallers.Create(__Helper_SerializeMessage, "
"context => __Helper_DeserializeMessage(context, $type$.Parser));\n",
"fieldname", GetMarshallerFieldName(message), "type",
GetClassName(message));
GRPC_CUSTOM_CSHARP_GETCLASSNAME(message));
}
out->Print("\n");
}
@ -406,12 +383,11 @@ void GenerateStaticMethodField(Printer* out, const MethodDescriptor* method) {
"static readonly grpc::Method<$request$, $response$> $fieldname$ = new "
"grpc::Method<$request$, $response$>(\n",
"fieldname", GetMethodFieldName(method), "request",
GetClassName(method->input_type()), "response",
GetClassName(method->output_type()));
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response",
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()));
out->Indent();
out->Indent();
out->Print("$methodtype$,\n", "methodtype",
GetCSharpMethodType(GetMethodType(method)));
out->Print("$methodtype$,\n", "methodtype", GetCSharpMethodType(method));
out->Print("$servicenamefield$,\n", "servicenamefield",
GetServiceNameFieldName());
out->Print("\"$methodname$\",\n", "methodname", method->name());
@ -434,8 +410,9 @@ void GenerateServiceDescriptorProperty(Printer* out,
"Descriptor\n");
out->Print("{\n");
out->Print(" get { return $umbrella$.Descriptor.Services[$index$]; }\n",
"umbrella", GetReflectionClassName(service->file()), "index",
index.str());
"umbrella",
GRPC_CUSTOM_CSHARP_GETREFLECTIONCLASSNAME(service->file()),
"index", index.str());
out->Print("}\n");
out->Print("\n");
}
@ -526,9 +503,7 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
for (int i = 0; i < service->method_count(); i++) {
const MethodDescriptor* method = service->method(i);
MethodType method_type = GetMethodType(method);
if (method_type == METHODTYPE_NO_STREAMING) {
if (!method->client_streaming() && !method->server_streaming()) {
// unary calls have an extra synchronous stub method
GenerateDocCommentClientMethod(out, method, true, false);
out->Print(
@ -539,8 +514,8 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
"cancellationToken = "
"default(global::System.Threading.CancellationToken))\n",
"methodname", method->name(), "request",
GetClassName(method->input_type()), "response",
GetClassName(method->output_type()));
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response",
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()));
out->Print("{\n");
out->Indent();
out->Print(
@ -557,8 +532,8 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
"public virtual $response$ $methodname$($request$ request, "
"grpc::CallOptions options)\n",
"methodname", method->name(), "request",
GetClassName(method->input_type()), "response",
GetClassName(method->output_type()));
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "response",
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()));
out->Print("{\n");
out->Indent();
out->Print(
@ -570,7 +545,7 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
}
std::string method_name = method->name();
if (method_type == METHODTYPE_NO_STREAMING) {
if (!method->client_streaming() && !method->server_streaming()) {
method_name += "Async"; // prevent name clash with synchronous method.
}
GenerateDocCommentClientMethod(out, method, false, false);
@ -607,33 +582,30 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
GetMethodReturnTypeClient(method));
out->Print("{\n");
out->Indent();
switch (GetMethodType(method)) {
case METHODTYPE_NO_STREAMING:
out->Print(
"return CallInvoker.AsyncUnaryCall($methodfield$, null, options, "
"request);\n",
"methodfield", GetMethodFieldName(method));
break;
case METHODTYPE_CLIENT_STREAMING:
out->Print(
"return CallInvoker.AsyncClientStreamingCall($methodfield$, null, "
"options);\n",
"methodfield", GetMethodFieldName(method));
break;
case METHODTYPE_SERVER_STREAMING:
out->Print(
"return CallInvoker.AsyncServerStreamingCall($methodfield$, null, "
"options, request);\n",
"methodfield", GetMethodFieldName(method));
break;
case METHODTYPE_BIDI_STREAMING:
out->Print(
"return CallInvoker.AsyncDuplexStreamingCall($methodfield$, null, "
"options);\n",
"methodfield", GetMethodFieldName(method));
break;
default:
GOOGLE_LOG(FATAL) << "Can't get here.";
if (!method->client_streaming() && !method->server_streaming()) {
// Non-Streaming
out->Print(
"return CallInvoker.AsyncUnaryCall($methodfield$, null, options, "
"request);\n",
"methodfield", GetMethodFieldName(method));
} else if (method->client_streaming() && !method->server_streaming()) {
// Client Streaming Only
out->Print(
"return CallInvoker.AsyncClientStreamingCall($methodfield$, null, "
"options);\n",
"methodfield", GetMethodFieldName(method));
} else if (!method->client_streaming() && method->server_streaming()) {
// Server Streaming Only
out->Print(
"return CallInvoker.AsyncServerStreamingCall($methodfield$, null, "
"options, request);\n",
"methodfield", GetMethodFieldName(method));
} else {
// Bi-Directional Streaming
out->Print(
"return CallInvoker.AsyncDuplexStreamingCall($methodfield$, null, "
"options);\n",
"methodfield", GetMethodFieldName(method));
}
out->Outdent();
out->Print("}\n");
@ -722,9 +694,10 @@ void GenerateBindServiceWithBinderMethod(Printer* out,
"new $servermethodtype$<$inputtype$, $outputtype$>("
"serviceImpl.$methodname$));\n",
"methodfield", GetMethodFieldName(method), "servermethodtype",
GetCSharpServerMethodType(GetMethodType(method)), "inputtype",
GetClassName(method->input_type()), "outputtype",
GetClassName(method->output_type()), "methodname", method->name());
GetCSharpServerMethodType(method), "inputtype",
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->input_type()), "outputtype",
GRPC_CUSTOM_CSHARP_GETCLASSNAME(method->output_type()), "methodname",
method->name());
}
out->Outdent();
@ -805,7 +778,7 @@ std::string GetServices(const FileDescriptor* file, bool generate_client,
out.Print("using grpc = global::Grpc.Core;\n");
out.Print("\n");
std::string file_namespace = GetFileNamespace(file);
std::string file_namespace = GRPC_CUSTOM_CSHARP_GETFILENAMESPACE(file);
if (file_namespace != "") {
out.Print("namespace $namespace$ {\n", "namespace", file_namespace);
out.Indent();

2
src/compiler/csharp_generator.h
Unescape View File

@ -21,8 +21,6 @@
#include "src/compiler/config.h"
#include <google/protobuf/compiler/csharp/csharp_names.h>
namespace grpc_csharp_generator {
std::string GetServices(const grpc::protobuf::FileDescriptor* file,

Write Preview
Loading…
Cancel
Save