You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/02/28 19:36:24 UTC
[1/2] git commit: THRIFT-2384 Binary map keys produce uncompilable
code in go
Repository: thrift
Updated Branches:
refs/heads/master 38eea034c -> 3e4c51f5c
THRIFT-2384 Binary map keys produce uncompilable code in go
Patch: Aleksey Pesternikov
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/111d13a1
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/111d13a1
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/111d13a1
Branch: refs/heads/master
Commit: 111d13a1e7b6293f4ed7a3729be9abb54dc5b770
Parents: 38eea03
Author: Jens Geyer <je...@apache.org>
Authored: Fri Feb 28 19:34:40 2014 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Feb 28 19:34:40 2014 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_go_generator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/111d13a1/compiler/cpp/src/generate/t_go_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index af7b379..57f9cb9 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -2930,7 +2930,7 @@ void t_go_generator::generate_serialize_map_element(ofstream &out,
t_field vfield(tmap->get_val_type(), "");
kfield.set_req(t_field::T_OPT_IN_REQ_OUT);
vfield.set_req(t_field::T_OPT_IN_REQ_OUT);
- generate_serialize_field(out, &kfield, kiter);
+ generate_serialize_field(out, &kfield, kiter, true);
generate_serialize_field(out, &vfield, viter);
}
[2/2] git commit: THRIFT-2378 service method arguments of binary type
lead to uncompileable Go code
Posted by je...@apache.org.
THRIFT-2378 service method arguments of binary type lead to uncompileable Go code
Patch: Jens Geyer
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3e4c51f5
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3e4c51f5
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3e4c51f5
Branch: refs/heads/master
Commit: 3e4c51f5cfc5466e40e536ffd02cac0730025c8e
Parents: 111d13a
Author: Jens Geyer <je...@apache.org>
Authored: Fri Feb 28 19:35:26 2014 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Feb 28 19:35:26 2014 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_go_generator.cc | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/3e4c51f5/compiler/cpp/src/generate/t_go_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index 57f9cb9..dadef5c 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -1145,7 +1145,7 @@ void t_go_generator::generate_go_struct_reader(ofstream& out,
}
// if negative id, ensure we generate a valid method name
- string field_method_prefix("readField");
+ string field_method_prefix("ReadField");
if (field_id < 0) {
field_method_prefix += "_";
@@ -1196,7 +1196,7 @@ void t_go_generator::generate_go_struct_reader(ofstream& out,
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
string field_type_name(publicize((*f_iter)->get_type()->get_name()));
string field_name(publicize((*f_iter)->get_name()));
- string field_method_prefix("readField");
+ string field_method_prefix("ReadField");
int32_t field_id = (*f_iter)->get_key();
if (field_id < 0) {
@@ -1977,8 +1977,13 @@ void t_go_generator::generate_service_remote(t_service* tservice)
break;
case t_base_type::TYPE_STRING:
- f_remote <<
- indent() << "argvalue" << i << " := flag.Arg(" << flagArg << ")" << endl;
+ if (((t_base_type*)the_type2)->is_binary()) {
+ f_remote <<
+ indent() << "argvalue" << i << " := []byte(flag.Arg(" << flagArg << "))" << endl;
+ } else {
+ f_remote <<
+ indent() << "argvalue" << i << " := flag.Arg(" << flagArg << ")" << endl;
+ }
break;
case t_base_type::TYPE_BOOL: