valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-06 18:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-4914: Fix name redeclaration bug in compiled go code

Browse Source 
Client: go

This fixes the bug reported in
https://github.com/apache/thrift/pull/2315#discussion_r577919697.
This commit is contained in:
Yuxuan 'fishy' Wang 2021-02-17 12:58:40 -08:00 committed by Yuxuan 'fishy' Wang
parent 36bd59ff82
commit a2522c0c83
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/cpp/src/thrift/generate/t_go_generator.cc
View File

@ -2170,14 +2170,15 @@ void t_go_generator::generate_service_client(t_service* tservice) {
}
if (!(*f_iter)->is_oneway()) {
std::string metaName = tmp("_meta");
std::string resultName = tmp("_result");
std::string resultType = publicize(method + "_result", true);
f_types_ << indent() << "var " << resultName << " " << resultType << endl;
f_types_ << indent() << "var meta thrift.ResponseMeta" << endl;
f_types_ << indent() << "meta, err = p.Client_().Call(ctx, \""
f_types_ << indent() << "var " << metaName << " thrift.ResponseMeta" << endl;
f_types_ << indent() << metaName << ", _err = p.Client_().Call(ctx, \""
<< method << "\", &" << argsName << ", &" << resultName << ")" << endl;
f_types_ << indent() << "p.SetLastResponseMeta_(meta)" << endl;
f_types_ << indent() << "if err != nil {" << endl;
f_types_ << indent() << "p.SetLastResponseMeta_(" << metaName << ")" << endl;
f_types_ << indent() << "if _err != nil {" << endl;
indent_up();
f_types_ << indent() << "return" << endl;
@ -2199,7 +2200,7 @@ void t_go_generator::generate_service_client(t_service* tservice) {
indent_up();
if (!(*f_iter)->get_returntype()->is_void()) {
f_types_ << indent() << "return r, " << field << endl;
f_types_ << indent() << "return _r, " << field << endl;
} else {
f_types_ << indent() << "return "<< field << endl;
}
@ -2222,7 +2223,7 @@ void t_go_generator::generate_service_client(t_service* tservice) {
f_types_ << indent() << "p.SetLastResponseMeta_(thrift.ResponseMeta{})" << endl;
// TODO: would be nice to not to duplicate the call generation
f_types_ << indent() << "if _, err := p.Client_().Call(ctx, \""
<< method << "\", &"<< argsName << ", nil); err != nil {" << endl;
<< method << "\", &" << argsName << ", nil); err != nil {" << endl;
indent_up();
f_types_ << indent() << "return err" << endl;
@ -3787,7 +3788,7 @@ string t_go_generator::function_signature_if(t_function* tfunction, string prefi
string errs = argument_list(exceptions);
if (!ret->is_void()) {
signature += "r " + type_to_go_type(ret);
signature += "_r " + type_to_go_type(ret);
if (addError || errs.size() == 0) {
signature += ", ";
@ -3795,7 +3796,7 @@ string t_go_generator::function_signature_if(t_function* tfunction, string prefi
}
if (addError) {
signature += "err error";
signature += "_err error";
}
signature += ")";

14
test/ThriftTest.thrift
View File

@ -411,3 +411,17 @@ struct StructB {
struct OptionalSetDefaultTest {
1: optional set<string> with_default = [ "test" ]
}
service ConflictingNamesTest {
/**
* Use some names that could conflict with the compiler code as args
* to make sure that the compiler handled them correctly.
*/
void testNameConflicts(
// 1: string args, // args is already a reserved keyword in thrift compiler
// 2: string result, // result will cause problems in compiled netstd code
3: string meta,
4: string r,
5: string err,
)
}