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 2020/09/12 17:12:22 UTC
[thrift] branch master updated: THRIFT-5260 Fix the thrift compiler
generate problematic lua code for the oneway method Client: lua Patch:
longzhiri
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 0371589 THRIFT-5260 Fix the thrift compiler generate problematic lua code for the oneway method Client: lua Patch: longzhiri <pe...@gmail.com>
0371589 is described below
commit 03715899d280c834f8cccbb0435fdedcc456c0e1
Author: longzhiri <pe...@gmail.com>
AuthorDate: Tue Aug 4 22:01:09 2020 +0800
THRIFT-5260 Fix the thrift compiler generate problematic lua code for the oneway method
Client: lua
Patch: longzhiri <pe...@gmail.com>
This closes #2212
The oneway method's processor has no need to write the result to client, but it is necessary to return values of each handler's return.
---
.../cpp/src/thrift/generate/t_lua_generator.cc | 63 +++++++++++++---------
lib/lua/TServer.lua | 10 +++-
test/lua/test_basic_client.lua | 3 ++
test/lua/test_basic_server.lua | 5 ++
4 files changed, 55 insertions(+), 26 deletions(-)
diff --git a/compiler/cpp/src/thrift/generate/t_lua_generator.cc b/compiler/cpp/src/thrift/generate/t_lua_generator.cc
index b63569d..17dbac7 100644
--- a/compiler/cpp/src/thrift/generate/t_lua_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_lua_generator.cc
@@ -659,7 +659,9 @@ void t_lua_generator::generate_service_processor(ostream& out, t_service* tservi
indent(out) << "local name, mtype, seqid = iprot:readMessageBegin()" << endl;
indent(out) << "local func_name = 'process_' .. name" << endl;
- indent(out) << "if not self[func_name] or ttype(self[func_name]) ~= 'function' then";
+ indent(out) << "if not self[func_name] or ttype(self[func_name]) ~= 'function' then" << endl;
+ indent_up();
+ indent(out) << "if oprot ~= nil then";
indent_up();
out << endl << indent() << "iprot:skip(TType.STRUCT)" << endl << indent()
<< "iprot:readMessageEnd()" << endl << indent() << "x = TApplicationException:new{" << endl
@@ -668,8 +670,11 @@ void t_lua_generator::generate_service_processor(ostream& out, t_service* tservi
<< "seqid)" << endl << indent() << "x:write(oprot)" << endl << indent()
<< "oprot:writeMessageEnd()" << endl << indent() << "oprot.trans:flush()" << endl;
indent_down();
+ out << indent() << "end" << endl << indent()
+ << "return false, 'Unknown function '..name" << endl;
+ indent_down();
indent(out) << "else" << endl << indent()
- << " self[func_name](self, seqid, iprot, oprot, server_ctx)" << endl << indent()
+ << " return self[func_name](self, seqid, iprot, oprot, server_ctx)" << endl << indent()
<< "end" << endl;
indent_down();
@@ -698,37 +703,45 @@ void t_lua_generator::generate_process_function(ostream& out,
// Read the request
out << indent() << "local args = " << argsname << ":new{}" << endl << indent()
<< "local reply_type = TMessageType.REPLY" << endl << indent() << "args:read(iprot)" << endl
- << indent() << "iprot:readMessageEnd()" << endl << indent() << "local result = " << resultname
- << ":new{}" << endl << indent() << "local status, res = pcall(self.handler." << fn_name
- << ", self.handler";
+ << indent() << "iprot:readMessageEnd()" << endl;
+ if (!tfunction->is_oneway()) {
+ out << indent() << "local result = " << resultname
+ << ":new{}" << endl;
+ }
+
+ out << indent() << "local status, res = pcall(self.handler." << fn_name
+ << ", self.handler";
// Print arguments
t_struct* args = tfunction->get_arglist();
if (args->get_members().size() > 0) {
out << ", " << argument_list(args, "args.");
}
+ out << ")" << endl;
- // Check for errors
- out << ")" << endl << indent() << "if not status then" << endl << indent()
- << " reply_type = TMessageType.EXCEPTION" << endl << indent()
- << " result = TApplicationException:new{message = res}" << endl;
-
- // Handle custom exceptions
- const std::vector<t_field*>& xf = tfunction->get_xceptions()->get_members();
- if (xf.size() > 0) {
- vector<t_field*>::const_iterator x_iter;
- for (x_iter = xf.begin(); x_iter != xf.end(); ++x_iter) {
- out << indent() << "elseif ttype(res) == '" << (*x_iter)->get_type()->get_name() << "' then"
- << endl << indent() << " result." << (*x_iter)->get_name() << " = res" << endl;
- }
- }
-
- // Set the result and write the reply
- out << indent() << "else" << endl << indent() << " result.success = res" << endl << indent()
- << "end" << endl << indent() << "oprot:writeMessageBegin('" << fn_name << "', reply_type, "
- << "seqid)" << endl << indent() << "result:write(oprot)" << endl << indent()
- << "oprot:writeMessageEnd()" << endl << indent() << "oprot.trans:flush()" << endl;
+ if (!tfunction->is_oneway()) {
+ // Check for errors
+ out << indent() << "if not status then" << endl << indent()
+ << " reply_type = TMessageType.EXCEPTION" << endl << indent()
+ << " result = TApplicationException:new{message = res}" << endl;
+
+ // Handle custom exceptions
+ const std::vector<t_field*>& xf = tfunction->get_xceptions()->get_members();
+ if (xf.size() > 0) {
+ vector<t_field*>::const_iterator x_iter;
+ for (x_iter = xf.begin(); x_iter != xf.end(); ++x_iter) {
+ out << indent() << "elseif ttype(res) == '" << (*x_iter)->get_type()->get_name() << "' then"
+ << endl << indent() << " result." << (*x_iter)->get_name() << " = res" << endl;
+ }
+ }
+ // Set the result and write the reply
+ out << indent() << "else" << endl << indent() << " result.success = res" << endl << indent()
+ << "end" << endl << indent() << "oprot:writeMessageBegin('" << fn_name << "', reply_type, "
+ << "seqid)" << endl << indent() << "result:write(oprot)" << endl << indent()
+ << "oprot:writeMessageEnd()" << endl << indent() << "oprot.trans:flush()" << endl;
+ }
+ out << indent() << "return status, res" << endl;
indent_down();
indent(out) << "end" << endl;
}
diff --git a/lib/lua/TServer.lua b/lib/lua/TServer.lua
index 4e37d58..9afe19e 100644
--- a/lib/lua/TServer.lua
+++ b/lib/lua/TServer.lua
@@ -85,9 +85,17 @@ function TServer:_preServe()
end
end
+function TServer:setExceptionHandler(exceptionHandler)
+ self.exceptionHandler = exceptionHandler
+end
+
function TServer:_handleException(err)
if string.find(err, 'TTransportException') == nil then
- print(err)
+ if self.exceptionHandler then
+ self.exceptionHandler(err)
+ else
+ print(err)
+ end
end
end
diff --git a/test/lua/test_basic_client.lua b/test/lua/test_basic_client.lua
index 77d8d07..11567d9 100644
--- a/test/lua/test_basic_client.lua
+++ b/test/lua/test_basic_client.lua
@@ -172,6 +172,9 @@ function testBasicClient(rawArgs)
assertEqual(o.i32_thing, r.i32_thing, 'Failed testStruct 3')
assertEqual(o.i64_thing, r.i64_thing, 'Failed testStruct 4')
+ -- oneway
+ client:testOneway(3)
+
-- TODO add list map set exception etc etc
end
diff --git a/test/lua/test_basic_server.lua b/test/lua/test_basic_server.lua
index acd2d79..20ac407 100644
--- a/test/lua/test_basic_server.lua
+++ b/test/lua/test_basic_server.lua
@@ -66,6 +66,10 @@ function TestHandler:testStruct(thing)
return thing
end
+function TestHandler:testOneway(secondsToSleep)
+ print("testOneway secondsToSleep:", secondsToSleep)
+end
+
--------------------------------------------------------------------------------
-- Test
local server
@@ -132,6 +136,7 @@ function testBasicServer(rawArgs)
protocolFactory = prot_factory
}
assert(server, 'Failed to create server')
+ server:setExceptionHandler(function (err) error(err) end)
-- Serve
server:serve()