You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/04/05 00:50:56 UTC
[2/2] git commit: THRIFT-1681: Add Lua Support Patch: Dave Watson
THRIFT-1681: Add Lua Support Patch: Dave Watson
Github Pull Request: This closes #92
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/6cf0ffce
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/6cf0ffce
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/6cf0ffce
Branch: refs/heads/master
Commit: 6cf0ffcec969e4a983171a5f411506b2ed0fd2c1
Parents: bdbf428
Author: Roger Meier <ro...@apache.org>
Authored: Sat Apr 5 00:45:42 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Sat Apr 5 00:50:35 2014 +0200
----------------------------------------------------------------------
compiler/cpp/Makefile.am | 3 +-
compiler/cpp/src/generate/t_lua_generator.cc | 1226 +++++++++++++++++++++
configure.ac | 18 +
lib/Makefile.am | 3 +
lib/lua/Makefile.am | 58 +
lib/lua/TBinaryProtocol.lua | 264 +++++
lib/lua/TBufferedTransport.lua | 91 ++
lib/lua/TFramedTransport.lua | 119 ++
lib/lua/TMemoryBuffer.lua | 91 ++
lib/lua/TProtocol.lua | 162 +++
lib/lua/TServer.lua | 139 +++
lib/lua/TSocket.lua | 132 +++
lib/lua/TTransport.lua | 93 ++
lib/lua/Thrift.lua | 273 +++++
lib/lua/src/longnumberutils.c | 47 +
lib/lua/src/luabitwise.c | 83 ++
lib/lua/src/luabpack.c | 162 +++
lib/lua/src/lualongnumber.c | 228 ++++
lib/lua/src/luasocket.c | 386 +++++++
lib/lua/src/socket.h | 78 ++
lib/lua/src/usocket.c | 362 ++++++
test/ThriftTest.thrift | 1 +
test/lua/test_basic_client.lua | 136 +++
test/lua/test_basic_server.lua | 104 ++
24 files changed, 4258 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/compiler/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 5fee856..47725bd 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -90,7 +90,8 @@ thrift_SOURCES += src/generate/t_c_glib_generator.cc \
src/generate/t_delphi_generator.cc \
src/generate/t_go_generator.cc \
src/generate/t_gv_generator.cc \
- src/generate/t_d_generator.cc
+ src/generate/t_d_generator.cc \
+ src/generate/t_lua_generator.cc
thrift_CPPFLAGS = -I$(srcdir)/src
thrift_CXXFLAGS = -Wall
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/compiler/cpp/src/generate/t_lua_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_lua_generator.cc b/compiler/cpp/src/generate/t_lua_generator.cc
new file mode 100644
index 0000000..b7fdad4
--- /dev/null
+++ b/compiler/cpp/src/generate/t_lua_generator.cc
@@ -0,0 +1,1226 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <sstream>
+#include "t_oop_generator.h"
+#include "platform.h"
+
+using std::ofstream;
+using std::string;
+using std::vector;
+using std::map;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
+
+/**
+ * LUA code generator.
+ *
+ */
+class t_lua_generator : public t_oop_generator {
+ public:
+ t_lua_generator(
+ t_program* program,
+ const std::map<std::string, std::string>& parsed_options,
+ const std::string& option_string)
+ : t_oop_generator(program)
+ {
+ std::map<std::string, std::string>::const_iterator iter;
+
+ iter = parsed_options.find("omit_requires");
+ gen_requires_ = (iter == parsed_options.end());
+
+ out_dir_base_ = "gen-lua";
+ }
+
+ /**
+ * Init and close methods
+ */
+ void init_generator();
+ void close_generator();
+
+ /**
+ * Program-level generation functions
+ */
+ void generate_typedef (t_typedef* ttypedef);
+ void generate_enum (t_enum* tenum);
+ void generate_const (t_const* tconst);
+ void generate_struct (t_struct* tstruct);
+ void generate_xception (t_struct* txception);
+ void generate_service (t_service* tservice);
+
+ std::string render_const_value(t_type* type, t_const_value* value);
+
+ private:
+
+ /**
+ * True iff we should generate lua require statements.
+ */
+ bool gen_requires_;
+
+ /**
+ * Struct-level generation functions
+ */
+ void generate_lua_struct_definition(
+ std::ofstream& out, t_struct* tstruct, bool is_xception=false);
+ void generate_lua_struct_reader(std::ofstream& out, t_struct* tstruct);
+ void generate_lua_struct_writer(std::ofstream& out, t_struct* tstruct);
+
+ /**
+ * Service-level generation functions
+ */
+ void generate_service_client (std::ofstream& out, t_service* tservice);
+ void generate_service_interface (std::ofstream& out, t_service* tservice);
+ void generate_service_processor (std::ofstream& out, t_service* tservice);
+ void generate_process_function (std::ofstream& out, t_service* tservice,
+ t_function* tfunction);
+ void generate_service_helpers (ofstream &out, t_service* tservice);
+ void generate_function_helpers (ofstream &out, t_function* tfunction);
+
+ /**
+ * Deserialization (Read)
+ */
+ void generate_deserialize_field(
+ std::ofstream &out, t_field *tfield, std::string prefix="");
+
+ void generate_deserialize_struct(
+ std::ofstream &out, t_struct *tstruct, std::string prefix="");
+
+ void generate_deserialize_container(
+ std::ofstream &out, t_type *ttype, std::string prefix="");
+
+ void generate_deserialize_set_element(
+ std::ofstream &out, t_set *tset, std::string prefix="");
+
+ void generate_deserialize_map_element(
+ std::ofstream &out, t_map *tmap, std::string prefix="");
+
+ void generate_deserialize_list_element(
+ std::ofstream &out, t_list *tlist, std::string prefix="");
+
+ /**
+ * Serialization (Write)
+ */
+ void generate_serialize_field(
+ std::ofstream &out, t_field *tfield, std::string prefix="");
+
+ void generate_serialize_struct(
+ std::ofstream &out, t_struct *tstruct, std::string prefix="");
+
+ void generate_serialize_container(
+ std::ofstream &out, t_type *ttype, std::string prefix="");
+
+ void generate_serialize_map_element(
+ std::ofstream &out, t_map *tmap, std::string kiter, std::string viter);
+
+ void generate_serialize_set_element(
+ std::ofstream &out, t_set *tmap, std::string iter);
+
+ void generate_serialize_list_element(
+ std::ofstream &out, t_list *tlist, std::string iter);
+
+ /**
+ * Helper rendering functions
+ */
+ std::string lua_includes();
+ std::string function_signature(t_function* tfunction, std::string prefix="");
+ std::string argument_list(t_struct* tstruct, std::string prefix="");
+ std::string type_to_enum(t_type* ttype);
+ static std::string get_namespace(const t_program* program);
+
+ std::string autogen_comment() {
+ return
+ std::string("--\n") +
+ "-- Autogenerated by Thrift\n" +
+ "--\n" +
+ "-- DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" +
+ "-- @""generated\n" +
+ "--\n";
+ }
+
+ /**
+ * File streams
+ */
+ std::ofstream f_types_;
+ std::ofstream f_consts_;
+ std::ofstream f_service_;
+};
+
+
+/**
+ * Init and close methods
+ */
+void t_lua_generator::init_generator() {
+ // Make output directory
+ string outdir = get_out_dir();
+ MKDIR(outdir.c_str());
+
+ // Make output files
+ string cur_namespace = get_namespace(program_);
+ string f_consts_name = outdir + cur_namespace + "constants.lua";
+ f_consts_.open(f_consts_name.c_str());
+ string f_types_name = outdir + cur_namespace + "ttypes.lua";
+ f_types_.open(f_types_name.c_str());
+
+ // Add headers
+ f_consts_ << autogen_comment() << lua_includes();
+ f_types_ << autogen_comment() << lua_includes();
+ if (gen_requires_) {
+ f_types_ << endl << "require '" << cur_namespace << "constants'";
+ }
+}
+
+void t_lua_generator::close_generator() {
+ // Close types file
+ f_types_.close();
+ f_consts_.close();
+}
+
+/**
+ * Generate a typedef (essentially a constant)
+ */
+void t_lua_generator::generate_typedef(t_typedef* ttypedef) {
+ f_types_
+ << endl << endl << indent()
+ << ttypedef->get_symbolic() << " = "
+ << ttypedef->get_type()->get_name();
+}
+
+/**
+ * Generates code for an enumerated type (table)
+ */
+void t_lua_generator::generate_enum(t_enum* tenum) {
+ f_types_ << endl << endl << tenum->get_name() << " = {" << endl;
+
+ vector<t_enum_value*> constants = tenum->get_constants();
+ vector<t_enum_value*>::iterator c_iter;
+ for (c_iter = constants.begin(); c_iter != constants.end();) {
+ int32_t value = (*c_iter)->get_value();
+
+ f_types_ << " " << (*c_iter)->get_name() << " = " << value;
+ ++c_iter;
+ if (c_iter != constants.end()) {
+ f_types_ << ",";
+ }
+ f_types_ << endl;
+ }
+ f_types_ << "}";
+}
+
+/**
+ * Generate a constant (non-local) value
+ */
+void t_lua_generator::generate_const(t_const* tconst) {
+ t_type* type = tconst->get_type();
+ string name = tconst->get_name();
+ t_const_value* value = tconst->get_value();
+
+ f_consts_ << endl << endl << name << " = ";
+ f_consts_ << render_const_value(type, value);
+}
+
+/**
+ * Prints the value of a constant with the given type.
+ */
+string t_lua_generator::render_const_value(
+ t_type* type, t_const_value* value) {
+ std::ostringstream out;
+
+ type = get_true_type(type);
+ if (type->is_base_type()) {
+ t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
+ switch (tbase) {
+ case t_base_type::TYPE_STRING:
+ out << "'" << value->get_string() << "'";
+ break;
+ case t_base_type::TYPE_BOOL:
+ out << (value->get_integer() > 0 ? "true" : "false");
+ break;
+ case t_base_type::TYPE_BYTE:
+ case t_base_type::TYPE_I16:
+ case t_base_type::TYPE_I32:
+ out << value->get_integer();
+ break;
+ case t_base_type::TYPE_I64:
+ out << "lualongnumber.new('" << value->get_string() << "')";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ if (value->get_type() == t_const_value::CV_INTEGER) {
+ out << value->get_integer();
+ } else {
+ out << value->get_double();
+ }
+ break;
+ default:
+ throw "compiler error: no const of base type "
+ + t_base_type::t_base_name(tbase);
+ }
+ } else if (type->is_enum()) {
+ out << value->get_integer();
+ } else if (type->is_struct() || type->is_xception()) {
+ out << type->get_name() << " = {" << endl;
+ indent_up();
+
+ const vector<t_field*>& fields = ((t_struct*)type)->get_members();
+ vector<t_field*>::const_iterator f_iter;
+ const map<t_const_value*, t_const_value*>& val = value->get_map();
+ map<t_const_value*, t_const_value*>::const_iterator v_iter;
+ for (v_iter = val.begin(); v_iter != val.end();) {
+ t_type* field_type = NULL;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_name() == v_iter->first->get_string()) {
+ field_type = (*f_iter)->get_type();
+ }
+ }
+ if (field_type == NULL) {
+ throw "type error: " + type->get_name() + " has no field "
+ + v_iter->first->get_string();
+ }
+
+ indent(out);
+ out << render_const_value(g_type_string, v_iter->first);
+ out << " = ";
+ out << render_const_value(field_type, v_iter->second);
+ ++v_iter;
+ if (v_iter != val.end()) {
+ out << ",";
+ }
+ }
+
+ out << "}";
+ indent_down();
+ } else if (type->is_map()) {
+ out << type->get_name() << "{" << endl;
+ indent_up();
+
+ t_type* ktype = ((t_map*)type)->get_key_type();
+ t_type* vtype = ((t_map*)type)->get_val_type();
+
+ const map<t_const_value*, t_const_value*>& val = value->get_map();
+ map<t_const_value*, t_const_value*>::const_iterator v_iter;
+ for (v_iter = val.begin(); v_iter != val.end();) {
+ indent(out)
+ << "[" << render_const_value(ktype, v_iter->first) << "] = "
+ << render_const_value(vtype, v_iter->second);
+ ++v_iter;
+ if (v_iter != val.end()) {
+ out << ",";
+ }
+ out << endl;
+ }
+ indent_down();
+ indent(out) << "}";
+ } else if (type->is_list() || type->is_set()) {
+ t_type* etype;
+ if (type->is_list()) {
+ etype = ((t_list*)type)->get_elem_type();
+ } else {
+ etype = ((t_set*)type)->get_elem_type();
+ }
+ out << type->get_name() << " = {" << endl;
+ const vector<t_const_value*>& val = value->get_list();
+ vector<t_const_value*>::const_iterator v_iter;
+ for (v_iter = val.begin(); v_iter != val.end();) {
+ indent(out);
+ out << "[" << render_const_value(etype, *v_iter) << "]";
+ if (type->is_set()) {
+ out << " = true";
+ } else {
+ out << " = false";
+ }
+ ++v_iter;
+ if (v_iter != val.end()) {
+ out << "," << endl;
+ }
+ }
+ out << "}";
+ }
+ return out.str();
+}
+
+/**
+ * Generate a thrift struct
+ */
+void t_lua_generator::generate_struct(t_struct* tstruct) {
+ generate_lua_struct_definition(f_types_, tstruct, false);
+}
+
+/**
+ * Generate a thrift exception
+ */
+void t_lua_generator::generate_xception(t_struct* txception) {
+ generate_lua_struct_definition(f_types_, txception, true);
+}
+
+/**
+ * Generate a thrift struct or exception (lua table)
+ */
+void t_lua_generator::generate_lua_struct_definition(ofstream &out,
+ t_struct *tstruct,
+ bool is_exception) {
+ vector<t_field*>::const_iterator m_iter;
+ const vector<t_field*>& members = tstruct->get_members();
+
+ indent(out) << endl << endl << tstruct->get_name();
+ if (is_exception) {
+ out << " = TException:new{" << endl <<
+ indent() << " __type = '" << tstruct->get_name() << "'";
+ if (members.size() > 0) {
+ out << ",";
+ }
+ out << endl;
+ } else {
+ out << " = __TObject:new{" << endl;
+ }
+ indent_up();
+ for (m_iter = members.begin(); m_iter != members.end();) {
+ indent(out);
+ out << (*m_iter)->get_name();
+ ++m_iter;
+ if (m_iter != members.end()) {
+ out << "," << endl;
+ }
+ }
+ indent_down();
+ indent(out);
+ out << endl << "}";
+
+ generate_lua_struct_reader(out, tstruct);
+ generate_lua_struct_writer(out, tstruct);
+}
+
+/**
+ * Generate a struct/exception reader
+ */
+void t_lua_generator::generate_lua_struct_reader(ofstream& out,
+ t_struct* tstruct) {
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator f_iter;
+
+ // function
+ indent(out) << endl << endl
+ << "function " << tstruct->get_name() << ":read(iprot)" << endl;
+ indent_up();
+
+ indent(out) << "iprot:readStructBegin()" << endl;
+
+ // while: Read in fields
+ indent(out) << "while true do" << endl;
+ indent_up();
+
+ // if: Check what to read
+ indent(out) << "local fname, ftype, fid = iprot:readFieldBegin()" << endl;
+ indent(out) << "if ftype == TType.STOP then" << endl;
+ indent_up();
+ indent(out) << "break" << endl;
+
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ indent_down();
+ indent(out)
+ << "elseif fid == " << (*f_iter)->get_key() << " then" << endl;
+ indent_up();
+ indent(out)
+ << "if ftype == " << type_to_enum((*f_iter)->get_type())
+ << " then" << endl;
+ indent_up();
+
+ // Read field contents
+ generate_deserialize_field(out, *f_iter, "self.");
+
+ indent_down();
+ indent(out) << "else" << endl;
+ indent(out) << " iprot:skip(ftype)" << endl;
+ indent(out) << "end" << endl;
+ }
+
+ // end if
+ indent_down();
+ indent(out) << "else" << endl;
+ indent(out) << " iprot:skip(ftype)" << endl;
+ indent(out) << "end" << endl;
+ indent(out) << "iprot:readFieldEnd()" << endl;
+
+ // end while
+ indent_down();
+ indent(out) << "end" << endl;
+ indent(out) << "iprot:readStructEnd()" << endl;
+
+ // end function
+ indent_down();
+ indent(out);
+ out << "end";
+}
+
+/**
+ * Generate a struct/exception writer
+ */
+void t_lua_generator::generate_lua_struct_writer(ofstream& out,
+ t_struct* tstruct) {
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator f_iter;
+
+ // function
+ indent(out) << endl << endl
+ << "function " << tstruct->get_name() << ":write(oprot)" << endl;
+ indent_up();
+
+ indent(out)
+ << "oprot:writeStructBegin('" << tstruct->get_name() << "')" << endl;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ indent(out) << "if self." << (*f_iter)->get_name() << " then" << endl;
+ indent_up();
+ indent(out)
+ << "oprot:writeFieldBegin('" << (*f_iter)->get_name() << "', "
+ << type_to_enum((*f_iter)->get_type()) << ", "
+ << (*f_iter)->get_key() << ")" << endl;
+
+ // Write field contents
+ generate_serialize_field(out, *f_iter, "self.");
+
+ indent(out)
+ << "oprot:writeFieldEnd()" << endl;
+ indent_down();
+ indent(out) << "end" << endl;
+ }
+ indent(out) << "oprot:writeFieldStop()" << endl;
+ indent(out) << "oprot:writeStructEnd()" << endl;
+
+ // end function
+ indent_down();
+ indent(out);
+ out << "end";
+}
+
+/**
+ * Generate a thrift service
+ */
+void t_lua_generator::generate_service(t_service* tservice) {
+ // Get output directory
+ string outdir = get_out_dir();
+
+ // Open the file for writing
+ string cur_ns = get_namespace(program_);
+ string f_service_name = outdir + cur_ns + tservice->get_name() + ".lua";
+ f_service_.open(f_service_name.c_str());
+
+ // Headers
+ f_service_ << autogen_comment() << lua_includes();
+ if (gen_requires_) {
+ f_service_ << endl << "require '" << cur_ns << "ttypes'" << endl;
+
+ if (tservice->get_extends() != NULL) {
+ f_service_
+ << "require '" << get_namespace(tservice->get_extends()->get_program())
+ << tservice->get_extends()->get_name() << "'" << endl;
+ }
+ }
+
+ f_service_ << endl;
+
+ generate_service_client(f_service_, tservice);
+ generate_service_interface(f_service_, tservice);
+ generate_service_processor(f_service_, tservice);
+ generate_service_helpers(f_service_, tservice);
+
+ // Close the file
+ f_service_.close();
+}
+
+void t_lua_generator::generate_service_interface(ofstream &out,
+ t_service* tservice) {
+ string classname = tservice->get_name() + "Iface";
+ t_service* extends_s = tservice->get_extends();
+
+ // Interface object definition
+ out << classname << " = ";
+ if (extends_s) {
+ out << extends_s->get_name() << "Iface:new{" << endl;
+ } else {
+ out << "__TObject:new{" << endl;
+ }
+ out
+ << " __type = '" << classname << "'" << endl
+ << "}" << endl << endl;
+}
+
+void t_lua_generator::generate_service_client(ofstream &out,
+ t_service* tservice) {
+ string classname = tservice->get_name() + "Client";
+ t_service* extends_s = tservice->get_extends();
+
+ // Client object definition
+ out << classname << " = __TObject.new(";
+ if (extends_s != NULL) {
+ out << extends_s->get_name() << "Client";
+ } else {
+ out << "__TClient";
+ }
+ out
+ <<", {" << endl
+ << " __type = '" << classname << "'" << endl
+ << "})" << endl;
+
+ // Send/Recv functions
+ vector<t_function*> functions = tservice->get_functions();
+ vector<t_function*>::const_iterator f_iter;
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ string sig = function_signature(*f_iter);
+ string funcname = (*f_iter)->get_name();
+
+ // Wrapper function
+ indent(out) << endl << "function " << classname << ":" << sig << endl;
+ indent_up();
+
+ indent(out) << "self:send_" << sig << endl << indent();
+ if (!(*f_iter)->is_oneway()) {
+ if (!(*f_iter)->get_returntype()->is_void()) {
+ out << "return ";
+ }
+ out << "self:recv_" << sig << endl;
+ }
+
+ indent_down();
+ indent(out) << "end" << endl;
+
+ // Send function
+ indent(out) << endl << "function " << classname << ":send_" << sig << endl;
+ indent_up();
+
+ indent(out) << "self.oprot:writeMessageBegin('" << funcname <<
+ "', TMessageType.CALL, self._seqid)" << endl;
+ indent(out) << "local args = " << funcname << "_args:new{}" << endl;
+
+ // Set the args
+ const vector<t_field*>& args = (*f_iter)->get_arglist()->get_members();
+ vector<t_field*>::const_iterator fld_iter;
+ for (fld_iter = args.begin(); fld_iter != args.end(); ++fld_iter) {
+ std::string argname = (*fld_iter)->get_name();
+ indent(out) << "args." << argname << " = " << argname << endl;
+ }
+
+ indent(out) << "args:write(self.oprot)" << endl;
+ indent(out) << "self.oprot:writeMessageEnd()" << endl;
+ indent(out) << "self.oprot.trans:flush()" << endl;
+
+ indent_down();
+ indent(out) << "end" << endl;
+
+ // Recv function
+ if (!(*f_iter)->is_oneway()) {
+ indent(out)
+ << endl << "function " << classname << ":recv_" << sig << endl;
+ indent_up();
+
+ out <<
+ indent() << "local fname, mtype, rseqid = self.iprot:"
+ << "readMessageBegin()"<< endl <<
+ indent() << "if mtype == TMessageType.EXCEPTION then" << endl <<
+ indent() << " local x = TApplicationException:new{}" << endl <<
+ indent() << " x:read(self.iprot)" << endl <<
+ indent() << " self.iprot:readMessageEnd()" << endl <<
+ indent() << " error(x)" << endl <<
+ indent() << "end" << endl <<
+ indent() << "local result = " << funcname << "_result:new{}"
+ << endl <<
+ indent() << "result:read(self.iprot)" << endl <<
+ indent() << "self.iprot:readMessageEnd()" << endl;
+
+ // Return the result if it's not a void function
+ if (!(*f_iter)->get_returntype()->is_void()) {
+ out <<
+ indent() << "if result.success then" << endl <<
+ indent() << " return result.success" << endl;
+
+ // Throw custom exceptions
+ const std::vector<t_field*>& xf =
+ (*f_iter)->get_xceptions()->get_members();
+ vector<t_field*>::const_iterator x_iter;
+ for (x_iter = xf.begin(); x_iter != xf.end(); ++x_iter) {
+ out <<
+ indent() << "elseif result." << (*x_iter)->get_name() << " then"
+ << endl <<
+ indent() << " error(result." << (*x_iter)->get_name() << ")"
+ << endl;
+ }
+
+ out <<
+ indent() << "end" << endl <<
+ indent() << "error(TApplicationException:new{errorCode = "
+ << "TApplicationException.MISSING_RESULT})" << endl;
+ }
+
+ indent_down();
+ indent(out) << "end" << endl;
+ }
+ }
+}
+
+void t_lua_generator::generate_service_processor(ofstream &out,
+ t_service* tservice) {
+ string classname = tservice->get_name() + "Processor";
+ t_service* extends_s = tservice->get_extends();
+
+ // Define processor table
+ out << endl
+ << classname << " = __TObject.new(";
+ if (extends_s != NULL) {
+ out << extends_s << "Processor" << endl;
+ } else {
+ out << "__TProcessor" << endl;
+ }
+ out
+ << ", {" << endl
+ << " __type = '" << classname << "'" << endl
+ << "})" << endl;
+
+ // Process function
+ indent(out) << endl << "function " << classname
+ << ":process(iprot, oprot, server_ctx)" << endl;
+ indent_up();
+
+ 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_up();
+ out << endl <<
+ indent() << "iprot:skip(TType.STRUCT)" << endl <<
+ indent() << "iprot:readMessageEnd()" << endl <<
+ indent() << "x = TApplicationException:new{" << endl <<
+ indent() << " errorCode = TApplicationException.UNKNOWN_METHOD" << endl
+ << indent() << "}" << endl <<
+ indent() << "oprot:writeMessageBegin(name, TMessageType.EXCEPTION, "
+ << "seqid)" << endl <<
+ indent() << "x:write(oprot)" << endl <<
+ indent() << "oprot:writeMessageEnd()" << endl <<
+ indent() << "oprot.trans:flush()" << endl;
+ indent_down();
+ indent(out) << "else" << endl <<
+ indent() << " self[func_name](self, seqid, iprot, oprot, server_ctx)"
+ << endl
+ << indent() << "end" << endl;
+
+ indent_down();
+ indent(out) << "end" << endl;
+
+ // Generate the process subfunctions
+ vector<t_function*> functions = tservice->get_functions();
+ vector<t_function*>::iterator f_iter;
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ generate_process_function(out, tservice, *f_iter);
+ }
+}
+
+void t_lua_generator::generate_process_function(ofstream &out,
+ t_service* tservice,
+ t_function* tfunction) {
+ string classname = tservice->get_name() + "Processor";
+ string argsname = tfunction->get_name() + "_args";
+ string resultname = tfunction->get_name() + "_result";
+ string fn_name = tfunction->get_name();
+
+ indent(out) << endl << "function " << classname << ":process_" << fn_name
+ << "(seqid, iprot, oprot, server_ctx)" << endl;
+ indent_up();
+
+ // 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";
+
+ // Print arguments
+ t_struct *args = tfunction->get_arglist();
+ if (args->get_members().size() > 0) {
+ out << ", " << argument_list(args, "args.");
+ }
+
+ // 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;
+
+ indent_down();
+ indent(out) << "end" << endl;
+}
+
+// Service helpers
+void t_lua_generator::generate_service_helpers(ofstream &out,
+ t_service* tservice) {
+ vector<t_function*> functions = tservice->get_functions();
+ vector<t_function*>::iterator f_iter;
+
+ out << endl << "-- HELPER FUNCTIONS AND STRUCTURES";
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ t_struct* ts = (*f_iter)->get_arglist();
+ generate_lua_struct_definition(out, ts, false);
+ generate_function_helpers(out, *f_iter);
+ }
+}
+
+void t_lua_generator::generate_function_helpers(ofstream &out,
+ t_function *tfunction) {
+ if (!tfunction->is_oneway()) {
+ t_struct result(program_, tfunction->get_name() + "_result");
+ t_field success(tfunction->get_returntype(), "success", 0);
+ if (!tfunction->get_returntype()->is_void()) {
+ result.append(&success);
+ }
+
+ t_struct* xs = tfunction->get_xceptions();
+ const vector<t_field*>& fields = xs->get_members();
+ vector<t_field*>::const_iterator f_iter;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ result.append(*f_iter);
+ }
+ generate_lua_struct_definition(out, &result, false);
+ }
+}
+
+/**
+ * Deserialize (Read)
+ */
+void t_lua_generator::generate_deserialize_field(ofstream &out,
+ t_field* tfield,
+ string prefix) {
+ t_type* type = get_true_type(tfield->get_type());
+
+ if (type->is_void()) {
+ throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " +
+ prefix + tfield->get_name();
+ }
+
+ string name = prefix + tfield->get_name();
+
+ if (type->is_struct() || type->is_xception()) {
+ generate_deserialize_struct(out, (t_struct*)type, name);
+ } else if (type->is_container()) {
+ generate_deserialize_container(out, type, name);
+ } else if (type->is_base_type() || type->is_enum()) {
+ indent(out) <<
+ name << " = iprot:";
+
+ if (type->is_base_type()) {
+ t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
+ switch (tbase) {
+ case t_base_type::TYPE_VOID:
+ throw "compiler error: cannot serialize void field in a struct: " +
+ name;
+ break;
+ case t_base_type::TYPE_STRING:
+ out << "readString()";
+ break;
+ case t_base_type::TYPE_BOOL:
+ out << "readBool()";
+ break;
+ case t_base_type::TYPE_BYTE:
+ out << "readByte()";
+ break;
+ case t_base_type::TYPE_I16:
+ out << "readI16()";
+ break;
+ case t_base_type::TYPE_I32:
+ out << "readI32()";
+ break;
+ case t_base_type::TYPE_I64:
+ out << "readI64()";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ out << "readDouble()";
+ break;
+ default:
+ throw "compiler error: no PHP name for base type " +
+ t_base_type::t_base_name(tbase);
+ }
+ } else if (type->is_enum()) {
+ out << "readI32()";
+ }
+ out << endl;
+
+ } else {
+ printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
+ tfield->get_name().c_str(), type->get_name().c_str());
+ }
+}
+
+void t_lua_generator::generate_deserialize_struct(ofstream &out,
+ t_struct* tstruct,
+ string prefix) {
+ indent(out)
+ << prefix << " = " << tstruct->get_name() << ":new{}" << endl
+ << indent() << prefix << ":read(iprot)" << endl;
+}
+
+void t_lua_generator::generate_deserialize_container(ofstream &out,
+ t_type* ttype,
+ string prefix) {
+ string size = tmp("_size");
+ string ktype = tmp("_ktype");
+ string vtype = tmp("_vtype");
+ string etype = tmp("_etype");
+
+ t_field fsize(g_type_i32, size);
+ t_field fktype(g_type_byte, ktype);
+ t_field fvtype(g_type_byte, vtype);
+ t_field fetype(g_type_byte, etype);
+
+ // Declare variables, read header
+ indent(out) << prefix << " = {}" << endl;
+ if (ttype->is_map()) {
+ indent(out) << "local " << ktype << ", " << vtype << ", " << size
+ << " = iprot:readMapBegin() " << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "local " << etype << ", " << size
+ << " = iprot:readSetBegin()" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "local " << etype << ", " << size
+ << " = iprot:readListBegin()" << endl;
+ }
+
+ // Deserialize
+ indent(out) << "for _i=1," << size << " do" << endl;
+ indent_up();
+
+ if (ttype->is_map()) {
+ generate_deserialize_map_element(out, (t_map*)ttype, prefix);
+ } else if (ttype->is_set()) {
+ generate_deserialize_set_element(out, (t_set*)ttype, prefix);
+ } else if (ttype->is_list()) {
+ generate_deserialize_list_element(out, (t_list*)ttype, prefix);
+ }
+
+ indent_down();
+ indent(out) << "end" << endl;
+
+ // Read container end
+ if (ttype->is_map()) {
+ indent(out) << "iprot:readMapEnd()" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "iprot:readSetEnd()" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "iprot:readListEnd()" << endl;
+ }
+}
+
+void t_lua_generator::generate_deserialize_map_element(ofstream &out,
+ t_map* tmap,
+ string prefix) {
+ // A map is represented by a table indexable by any lua type
+ string key = tmp("_key");
+ string val = tmp("_val");
+ t_field fkey(tmap->get_key_type(), key);
+ t_field fval(tmap->get_val_type(), val);
+
+ generate_deserialize_field(out, &fkey);
+ generate_deserialize_field(out, &fval);
+
+ indent(out) << prefix << "[" << key << "] = " << val << endl;
+}
+
+void t_lua_generator::generate_deserialize_set_element(ofstream &out,
+ t_set* tset,
+ string prefix) {
+ // A set is represented by a table indexed by the value
+ string elem = tmp("_elem");
+ t_field felem(tset->get_elem_type(), elem);
+
+ generate_deserialize_field(out, &felem);
+
+ indent(out) <<
+ prefix << "[" << elem << "] = " << elem << endl;
+}
+
+void t_lua_generator::generate_deserialize_list_element(ofstream &out,
+ t_list* tlist,
+ string prefix) {
+ // A list is represented by a table indexed by integer values
+ // LUA natively provides all of the functions required to maintain a list
+ string elem = tmp("_elem");
+ t_field felem(tlist->get_elem_type(), elem);
+
+ generate_deserialize_field(out, &felem);
+
+ indent(out) << "table.insert(" << prefix << ", " << elem << ")" << endl;
+}
+
+/**
+ * Serialize (Write)
+ */
+void t_lua_generator::generate_serialize_field(ofstream &out,
+ t_field* tfield,
+ string prefix) {
+ t_type* type = get_true_type(tfield->get_type());
+ string name = prefix + tfield->get_name();
+
+ // Do nothing for void types
+ if (type->is_void()) {
+ throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
+ }
+
+ if (type->is_struct() || type->is_xception()) {
+ generate_serialize_struct(out, (t_struct*)type, name);
+ } else if (type->is_container()) {
+ generate_serialize_container(out, type, name);
+ } else if (type->is_base_type() || type->is_enum()) {
+ indent(out) << "oprot:";
+
+ if (type->is_base_type()) {
+ t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
+ switch (tbase) {
+ case t_base_type::TYPE_VOID:
+ throw
+ "compiler error: cannot serialize void field in a struct: " + name;
+ break;
+ case t_base_type::TYPE_STRING:
+ out << "writeString(" << name << ")";
+ break;
+ case t_base_type::TYPE_BOOL:
+ out << "writeBool(" << name << ")";
+ break;
+ case t_base_type::TYPE_BYTE:
+ out << "writeByte(" << name << ")";
+ break;
+ case t_base_type::TYPE_I16:
+ out << "writeI16(" << name << ")";
+ break;
+ case t_base_type::TYPE_I32:
+ out << "writeI32(" << name << ")";
+ break;
+ case t_base_type::TYPE_I64:
+ out << "writeI64(" << name << ")";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ out << "writeDouble(" << name << ")";
+ break;
+ default:
+ throw "compiler error: no PHP name for base type " +
+ t_base_type::t_base_name(tbase);
+ }
+ } else if (type->is_enum()) {
+ out << "writeI32(" << name << ")";
+ }
+ out << endl;
+ } else {
+ printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s' TYPE '%s'\n",
+ name.c_str(),
+ type->get_name().c_str());
+ }
+}
+
+void t_lua_generator::generate_serialize_struct(ofstream &out,
+ t_struct* tstruct,
+ string prefix) {
+ indent(out) << prefix << ":write(oprot)" << endl;
+}
+
+void t_lua_generator::generate_serialize_container(ofstream &out,
+ t_type* ttype,
+ string prefix) {
+ // Begin writing
+ if (ttype->is_map()) {
+ indent(out) <<
+ "oprot:writeMapBegin(" <<
+ type_to_enum(((t_map*)ttype)->get_key_type()) << ", " <<
+ type_to_enum(((t_map*)ttype)->get_val_type()) << ", " <<
+ "string.len(" << prefix << "))" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) <<
+ "oprot:writeSetBegin(" <<
+ type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " <<
+ "string.len(" << prefix << "))" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) <<
+ "oprot:writeListBegin(" <<
+ type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " <<
+ "string.len(" << prefix << "))" << endl;
+ }
+
+ // Serialize
+ if (ttype->is_map()) {
+ string kiter = tmp("kiter");
+ string viter = tmp("viter");
+ indent(out)
+ << "for " << kiter << "," << viter << " in pairs(" << prefix << ") do"
+ << endl;
+ indent_up();
+ generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
+ indent_down();
+ indent(out) << "end" << endl;
+ } else if (ttype->is_set()) {
+ string iter = tmp("iter");
+ indent(out) <<
+ "for " << iter << ",_ in pairs(" << prefix << ") do" << endl;
+ indent_up();
+ generate_serialize_set_element(out, (t_set*)ttype, iter);
+ indent_down();
+ indent(out) << "end" << endl;
+ } else if (ttype->is_list()) {
+ string iter = tmp("iter");
+ indent(out) <<
+ "for _," << iter << " in ipairs(" << prefix << ") do" << endl;
+ indent_up();
+ generate_serialize_list_element(out, (t_list*)ttype, iter);
+ indent_down();
+ indent(out) << "end" << endl;
+ }
+
+ // Finish writing
+ if (ttype->is_map()) {
+ indent(out) << "oprot:writeMapEnd()" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "oprot:writeSetEnd()" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "oprot:writeListEnd()" << endl;
+ }
+}
+
+void t_lua_generator::generate_serialize_map_element(ofstream &out,
+ t_map* tmap,
+ string kiter,
+ string viter) {
+ t_field kfield(tmap->get_key_type(), kiter);
+ generate_serialize_field(out, &kfield, "");
+
+ t_field vfield(tmap->get_val_type(), viter);
+ generate_serialize_field(out, &vfield, "");
+}
+
+void t_lua_generator::generate_serialize_set_element(ofstream &out,
+ t_set* tset,
+ string iter) {
+ t_field efield(tset->get_elem_type(), iter);
+ generate_serialize_field(out, &efield, "");
+}
+
+void t_lua_generator::generate_serialize_list_element(ofstream &out,
+ t_list* tlist,
+ string iter) {
+ t_field efield(tlist->get_elem_type(), iter);
+ generate_serialize_field(out, &efield, "");
+}
+
+/**
+ * Helper rendering functions
+ */
+string t_lua_generator::lua_includes() {
+ if (gen_requires_) {
+ return "\n\nrequire 'Thrift'";
+ } else {
+ return "";
+ }
+}
+
+string t_lua_generator::get_namespace(const t_program* program) {
+ std::string real_module = program->get_namespace("lua");
+ if (real_module.empty()) {
+ return program->get_name() + "_";
+ }
+ return real_module + "_";
+}
+
+string t_lua_generator::function_signature(t_function* tfunction,
+ string prefix) {
+ std::string ret = tfunction->get_name() + "(" +
+ argument_list(tfunction->get_arglist()) + ")";
+ return ret;
+}
+
+string t_lua_generator::argument_list(t_struct* tstruct, string prefix) {
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator fld_iter;
+ std::string ret = "";
+ for (fld_iter = fields.begin(); fld_iter != fields.end();) {
+ ret += prefix + (*fld_iter)->get_name();
+ ++fld_iter;
+ if (fld_iter != fields.end()) {
+ ret += ", ";
+ }
+ }
+ return ret;
+}
+
+string t_lua_generator::type_to_enum(t_type* type) {
+ type = get_true_type(type);
+
+ if (type->is_base_type()) {
+ t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
+ switch (tbase) {
+ case t_base_type::TYPE_VOID:
+ throw "NO T_VOID CONSTRUCT";
+ case t_base_type::TYPE_STRING:
+ return "TType.STRING";
+ case t_base_type::TYPE_BOOL:
+ return "TType.BOOL";
+ case t_base_type::TYPE_BYTE:
+ return "TType.BYTE";
+ case t_base_type::TYPE_I16:
+ return "TType.I16";
+ case t_base_type::TYPE_I32:
+ return "TType.I32";
+ case t_base_type::TYPE_I64:
+ return "TType.I64";
+ case t_base_type::TYPE_DOUBLE:
+ return "TType.DOUBLE";
+ }
+ } else if (type->is_enum()) {
+ return "TType.I32";
+ } else if (type->is_struct() || type->is_xception()) {
+ return "TType.STRUCT";
+ } else if (type->is_map()) {
+ return "TType.MAP";
+ } else if (type->is_set()) {
+ return "TType.SET";
+ } else if (type->is_list()) {
+ return "TType.LIST";
+ }
+
+ throw "INVALID TYPE IN type_to_enum: " + type->get_name();
+}
+
+THRIFT_REGISTER_GENERATOR(lua, "Lua", "");
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 7eea98f..483c283 100755
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,7 @@ if test "$enable_libs" = "no"; then
with_go="no"
with_d="no"
with_nodejs="no"
+ with_lua="no"
fi
@@ -214,6 +215,16 @@ fi
AM_CONDITIONAL(WITH_NODEJS, [test "$have_nodejs" = "yes"])
AM_CONDITIONAL(HAVE_NPM, [test "x$NPM" != "x"])
+AX_THRIFT_LIB(lua, [Lua], yes)
+have_lua=no
+if test "$with_lua" = "yes"; then
+ AC_PATH_PROGS([LUA], [lua])
+ if test "x$LUA" != "x"; then
+ have_lua="yes"
+ fi
+fi
+AM_CONDITIONAL(WITH_LUA, [test "$have_lua" = "yes"])
+
AX_THRIFT_LIB(python, [Python], yes)
if test "$with_python" = "yes"; then
AM_PATH_PYTHON(2.4,, :)
@@ -634,6 +645,7 @@ AC_CONFIG_FILES([
lib/php/test/Makefile
lib/py/Makefile
lib/rb/Makefile
+ lib/lua/Makefile
test/Makefile
test/cpp/Makefile
test/hs/Makefile
@@ -674,6 +686,7 @@ echo "Building Erlang Library ...... : $have_erlang"
echo "Building Go Library .......... : $have_go"
echo "Building D Library ........... : $have_d"
echo "Building NodeJS Library ...... : $have_nodejs"
+echo "Building Lua Library ......... : $have_lua"
if test "$have_cpp" = "yes" ; then
echo
@@ -744,6 +757,11 @@ if test "$have_nodejs" = "yes" ; then
echo " Using NodeJS .............. : $NODEJS"
echo " Using NodeJS version....... : $($NODEJS --version)"
fi
+if test "$have_lua" = "yes" ; then
+ echo
+ echo "Lua Library:"
+ echo " Using Lua .............. : $LUA"
+fi
echo
echo "If something is missing that you think should be present,"
echo "please skim the output of configure to find the missing"
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 26d9020..0ff7fa0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,6 +74,9 @@ if WITH_NODEJS
SUBDIRS += nodejs
endif
+if WITH_LUA
+SUBDIRS += lua
+endif
# All of the libs that don't use Automake need to go in here
# so they will end up in our release tarballs.
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am
new file mode 100644
index 0000000..1c42967
--- /dev/null
+++ b/lib/lua/Makefile.am
@@ -0,0 +1,58 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+SUBDIRS = .
+
+lib_LTLIBRARIES = libluasocket.la \
+ libluabpack.la \
+ libluabitwise.la \
+ liblualongnumber.la
+
+libluasocket_la_SOURCES = src/luasocket.c \
+ src/usocket.c
+
+libluasocket_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
+libluasocket_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
+
+libluabpack_la_SOURCES = src/luabpack.c
+
+libluabpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
+libluabpack_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
+libluabpack_la_LIBADD = liblualongnumber.la
+
+libluabitwise_la_SOURCES = src/luabitwise.c
+
+libluabitwise_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
+libluabitwise_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
+
+liblualongnumber_la_SOURCES = src/lualongnumber.c \
+ src/longnumberutils.c
+
+liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
+liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
+
+EXTRA_DIST = TBinaryProtocol.lua \
+ TBufferedTransport.lua \
+ TFramedTransport.lua \
+ Thrift.lua \
+ TMemoryBuffer.lua \
+ TProtocol.lua \
+ TServer.lua \
+ TSocket.lua \
+ TTransport.lua
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TBinaryProtocol.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TBinaryProtocol.lua b/lib/lua/TBinaryProtocol.lua
new file mode 100644
index 0000000..df13d61
--- /dev/null
+++ b/lib/lua/TBinaryProtocol.lua
@@ -0,0 +1,264 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'TProtocol'
+require 'libluabpack'
+require 'libluabitwise'
+
+TBinaryProtocol = __TObject.new(TProtocolBase, {
+ __type = 'TBinaryProtocol',
+ VERSION_MASK = -65536, -- 0xffff0000
+ VERSION_1 = -2147418112, -- 0x80010000
+ TYPE_MASK = 0x000000ff,
+ strictRead = false,
+ strictWrite = true
+})
+
+function TBinaryProtocol:writeMessageBegin(name, ttype, seqid)
+ if self.stirctWrite then
+ self:writeI32(libluabitwise.bor(TBinaryProtocol.VERSION_1, ttype))
+ self:writeString(name)
+ self:writeI32(seqid)
+ else
+ self:writeString(name)
+ self:writeByte(ttype)
+ self:writeI32(seqid)
+ end
+end
+
+function TBinaryProtocol:writeMessageEnd()
+end
+
+function TBinaryProtocol:writeStructBegin(name)
+end
+
+function TBinaryProtocol:writeStructEnd()
+end
+
+function TBinaryProtocol:writeFieldBegin(name, ttype, id)
+ self:writeByte(ttype)
+ self:writeI16(id)
+end
+
+function TBinaryProtocol:writeFieldEnd()
+end
+
+function TBinaryProtocol:writeFieldStop()
+ self:writeByte(TType.STOP);
+end
+
+function TBinaryProtocol:writeMapBegin(ktype, vtype, size)
+ self:writeByte(ktype)
+ self:writeByte(vtype)
+ self:writeI32(size)
+end
+
+function TBinaryProtocol:writeMapEnd()
+end
+
+function TBinaryProtocol:writeListBegin(etype, size)
+ self:writeByte(etype)
+ self:writeI32(size)
+end
+
+function TBinaryProtocol:writeListEnd()
+end
+
+function TBinaryProtocol:writeSetBegin(etype, size)
+ self:writeByte(etype)
+ self:writeI32(size)
+end
+
+function TBinaryProtocol:writeSetEnd()
+end
+
+function TBinaryProtocol:writeBool(bool)
+ if bool then
+ self:writeByte(1)
+ else
+ self:writeByte(0)
+ end
+end
+
+function TBinaryProtocol:writeByte(byte)
+ local buff = libluabpack.bpack('c', byte)
+ self.trans:write(buff)
+end
+
+function TBinaryProtocol:writeI16(i16)
+ local buff = libluabpack.bpack('s', i16)
+ self.trans:write(buff)
+end
+
+function TBinaryProtocol:writeI32(i32)
+ local buff = libluabpack.bpack('i', i32)
+ self.trans:write(buff)
+end
+
+function TBinaryProtocol:writeI64(i64)
+ local buff = libluabpack.bpack('l', i64)
+ self.trans:write(buff)
+end
+
+function TBinaryProtocol:writeDouble(dub)
+ local buff = libluabpack.bpack('d', dub)
+ self.trans:write(buff)
+end
+
+function TBinaryProtocol:writeString(str)
+ -- Should be utf-8
+ self:writeI32(string.len(str))
+ self.trans:write(str)
+end
+
+function TBinaryProtocol:readMessageBegin()
+ local sz, ttype, name, seqid = self:readI32()
+ if sz < 0 then
+ local version = libluabitwise.band(sz, TBinaryProtocol.VERSION_MASK)
+ if version ~= TBinaryProtocol.VERSION_1 then
+ terror(TProtocolException:new{
+ message = 'Bad version in readMessageBegin: ' .. sz
+ })
+ end
+ ttype = libluabitwise.band(sz, TBinaryProtocol.TYPE_MASK)
+ name = self:readString()
+ seqid = self:readI32()
+ else
+ if self.strictRead then
+ terror(TProtocolException:new{message = 'No protocol version header'})
+ end
+ name = self.trans:readAll(sz)
+ ttype = self:readByte()
+ seqid = self:readI32()
+ end
+ return name, ttype, seqid
+end
+
+function TBinaryProtocol:readMessageEnd()
+end
+
+function TBinaryProtocol:readStructBegin()
+ return nil
+end
+
+function TBinaryProtocol:readStructEnd()
+end
+
+function TBinaryProtocol:readFieldBegin()
+ local ttype = self:readByte()
+ if ttype == TType.STOP then
+ return nil, ttype, 0
+ end
+ local id = self:readI16()
+ return nil, ttype, id
+end
+
+function TBinaryProtocol:readFieldEnd()
+end
+
+function TBinaryProtocol:readMapBegin()
+ local ktype = self:readByte()
+ local vtype = self:readByte()
+ local size = self:readI32()
+ return ktype, vtype, size
+end
+
+function TBinaryProtocol:readMapEnd()
+end
+
+function TBinaryProtocol:readListBegin()
+ local etype = self:readByte()
+ local size = self:readI32()
+ return etype, size
+end
+
+function TBinaryProtocol:readListEnd()
+end
+
+function TBinaryProtocol:readSetBegin()
+ local etype = self:readByte()
+ local size = self:readI32()
+ return etype, size
+end
+
+function TBinaryProtocol:readSetEnd()
+end
+
+function TBinaryProtocol:readBool()
+ local byte = self:readByte()
+ if byte == 0 then
+ return false
+ end
+ return true
+end
+
+function TBinaryProtocol:readByte()
+ local buff = self.trans:readAll(1)
+ local val = libluabpack.bunpack('c', buff)
+ return val
+end
+
+function TBinaryProtocol:readI16()
+ local buff = self.trans:readAll(2)
+ local val = libluabpack.bunpack('s', buff)
+ return val
+end
+
+function TBinaryProtocol:readI32()
+ local buff = self.trans:readAll(4)
+ local val = libluabpack.bunpack('i', buff)
+ return val
+end
+
+function TBinaryProtocol:readI64()
+ local buff = self.trans:readAll(8)
+ local val = libluabpack.bunpack('l', buff)
+ return val
+end
+
+function TBinaryProtocol:readDouble()
+ local buff = self.trans:readAll(8)
+ local val = libluabpack.bunpack('d', buff)
+ return val
+end
+
+function TBinaryProtocol:readString()
+ local len = self:readI32()
+ local str = self.trans:readAll(len)
+ return str
+end
+
+TBinaryProtocolFactory = TProtocolFactory:new{
+ __type = 'TBinaryProtocolFactory',
+ strictRead = false
+}
+
+function TBinaryProtocolFactory:getProtocol(trans)
+ -- TODO Enforce that this must be a transport class (ie not a bool)
+ if not trans then
+ terror(TProtocolException:new{
+ message = 'Must supply a transport to ' .. ttype(self)
+ })
+ end
+ return TBinaryProtocol:new{
+ trans = trans,
+ strictRead = self.strictRead,
+ strictWrite = true
+ }
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TBufferedTransport.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TBufferedTransport.lua b/lib/lua/TBufferedTransport.lua
new file mode 100644
index 0000000..2b0b946
--- /dev/null
+++ b/lib/lua/TBufferedTransport.lua
@@ -0,0 +1,91 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'TTransport'
+
+TBufferedTransport = TTransportBase:new{
+ __type = 'TBufferedTransport',
+ rBufSize = 2048,
+ wBufSize = 2048,
+ wBuf = '',
+ rBuf = ''
+}
+
+function TBufferedTransport:new(obj)
+ if ttype(obj) ~= 'table' then
+ error(ttype(self) .. 'must be initialized with a table')
+ end
+
+ -- Ensure a transport is provided
+ if not obj.trans then
+ error('You must provide ' .. ttype(self) .. ' with a trans')
+ end
+
+ return TTransportBase:new(obj)
+end
+
+function TBufferedTransport:isOpen()
+ return self.trans:isOpen()
+end
+
+function TBufferedTransport:open()
+ return self.trans:open()
+end
+
+function TBufferedTransport:close()
+ return self.trans:close()
+end
+
+function TBufferedTransport:read(len)
+ return self.trans:read(len)
+end
+
+function TBufferedTransport:readAll(len)
+ return self.trans:readAll(len)
+end
+
+function TBufferedTransport:write(buf)
+ self.wBuf = self.wBuf .. buf
+ if string.len(self.wBuf) >= self.wBufSize then
+ self.trans:write(self.wBuf)
+ self.wBuf = ''
+ end
+end
+
+function TBufferedTransport:flush()
+ if string.len(self.wBuf) > 0 then
+ self.trans:write(self.wBuf)
+ self.wBuf = ''
+ end
+end
+
+TBufferedTransportFactory = TTransportFactoryBase:new{
+ __type = 'TBufferedTransportFactory'
+}
+
+function TBufferedTransportFactory:getTransport(trans)
+ if not trans then
+ terror(TTransportException:new{
+ message = 'Must supply a transport to ' .. ttype(self)
+ })
+ end
+ return TBufferedTransport:new{
+ trans = trans
+ }
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TFramedTransport.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TFramedTransport.lua b/lib/lua/TFramedTransport.lua
new file mode 100644
index 0000000..84ae3ec
--- /dev/null
+++ b/lib/lua/TFramedTransport.lua
@@ -0,0 +1,119 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'TTransport'
+require 'libluabpack'
+
+TFramedTransport = TTransportBase:new{
+ __type = 'TFramedTransport',
+ doRead = true,
+ doWrite = true,
+ wBuf = '',
+ rBuf = ''
+}
+
+function TFramedTransport:new(obj)
+ if ttype(obj) ~= 'table' then
+ error(ttype(self) .. 'must be initialized with a table')
+ end
+
+ -- Ensure a transport is provided
+ if not obj.trans then
+ error('You must provide ' .. ttype(self) .. ' with a trans')
+ end
+
+ return TTransportBase:new(obj)
+end
+
+function TFramedTransport:isOpen()
+ return self.trans:isOpen()
+end
+
+function TFramedTransport:open()
+ return self.trans:open()
+end
+
+function TFramedTransport:close()
+ return self.trans:close()
+end
+
+function TFramedTransport:read(len)
+ if string.len(self.rBuf) == 0 then
+ self:__readFrame()
+ end
+
+ if self.doRead == false then
+ return self.trans:read(len)
+ end
+
+ if len > string.len(self.rBuf) then
+ local val = self.rBuf
+ self.rBuf = ''
+ return val
+ end
+
+ local val = string.sub(self.rBuf, 0, len)
+ self.rBuf = string.sub(self.rBuf, len)
+ return val
+end
+
+function TFramedTransport:__readFrame()
+ local buf = self.trans:readAll(4)
+ local frame_len = libluabpack.bunpack('i', buf)
+ self.rBuf = self.trans:readAll(frame_len)
+end
+
+function TFramedTransport:readAll(len)
+ return self.trans:readAll(len)
+end
+
+function TFramedTransport:write(buf, len)
+ if self.doWrite == false then
+ return self.trans:write(buf, len)
+ end
+
+ if len and len < string.len(buf) then
+ buf = string.sub(buf, 0, len)
+ end
+ self.wBuf = self.wBuf + buf
+end
+
+function TFramedTransport:flush()
+ if self.doWrite == false then
+ return self.trans:flush()
+ end
+
+ -- If the write fails we still want wBuf to be clear
+ local tmp = self.wBuf
+ self.wBuf = ''
+ self.trans:write(tmp)
+ self.trans:flush()
+end
+
+TFramedTransportFactory = TTransportFactoryBase:new{
+ __type = 'TFramedTransportFactory'
+}
+function TFramedTransportFactory:getTransport(trans)
+ if not trans then
+ terror(TProtocolException:new{
+ message = 'Must supply a transport to ' .. ttype(self)
+ })
+ end
+ return TFramedTransport:new{trans = trans}
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TMemoryBuffer.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TMemoryBuffer.lua b/lib/lua/TMemoryBuffer.lua
new file mode 100644
index 0000000..3d43686
--- /dev/null
+++ b/lib/lua/TMemoryBuffer.lua
@@ -0,0 +1,91 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'TTransport'
+
+TMemoryBuffer = TTransportBase:new{
+ __type = 'TMemoryBuffer',
+ buffer = '',
+ bufferSize = 1024,
+ wPos = 0,
+ rPos = 0
+}
+function TMemoryBuffer:isOpen()
+ return 1
+end
+function TMemoryBuffer:open() end
+function TMemoryBuffer:close() end
+
+function TMemoryBuffer:peak()
+ return self.rPos < self.wPos
+end
+
+function TMemoryBuffer:getBuffer()
+ return self.buffer
+end
+
+function TMemoryBuffer:resetBuffer(buf)
+ if buf then
+ self.buffer = buf
+ self.bufferSize = string.len(buf)
+ else
+ self.buffer = ''
+ self.bufferSize = 1024
+ end
+ self.wPos = string.len(buf)
+ self.rPos = 0
+end
+
+function TMemoryBuffer:available()
+ return self.wPos - self.rPos
+end
+
+function TMemoryBuffer:read(len)
+ local avail = self:available()
+ if avail == 0 then
+ return ''
+ end
+
+ if avail < len then
+ len = avail
+ end
+
+ local val = string.sub(self.buffer, self.rPos, len)
+ self.rPos = self.rPos + len
+ return val
+end
+
+function TMemoryBuffer:readAll(len)
+ local avail = self:available()
+
+ if avail < len then
+ local msg = string.format('Attempt to readAll(%d) found only %d available',
+ len, avail)
+ terror(TTransportException:new{message = msg})
+ end
+ -- read should block so we don't need a loop here
+ return self:read(len)
+end
+
+function TMemoryBuffer:write(buf)
+ self.buffer = self.buffer + buf
+ self.wPos = self.wPos + buf
+end
+
+function TMemoryBuffer:flush() end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TProtocol.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TProtocol.lua b/lib/lua/TProtocol.lua
new file mode 100644
index 0000000..9eb94f5
--- /dev/null
+++ b/lib/lua/TProtocol.lua
@@ -0,0 +1,162 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'Thrift'
+
+TProtocolException = TException:new {
+ UNKNOWN = 0,
+ INVALID_DATA = 1,
+ NEGATIVE_SIZE = 2,
+ SIZE_LIMIT = 3,
+ BAD_VERSION = 4,
+ INVALID_PROTOCOL = 5,
+ MISSING_REQUIRED_FIELD = 6,
+ errorCode = 0,
+ __type = 'TProtocolException'
+}
+function TProtocolException:__errorCodeToString()
+ if self.errorCode == self.INVALID_DATA then
+ return 'Invalid data'
+ elseif self.errorCode == self.NEGATIVE_SIZE then
+ return 'Negative size'
+ elseif self.errorCode == self.SIZE_LIMIT then
+ return 'Size limit'
+ elseif self.errorCode == self.BAD_VERSION then
+ return 'Bad version'
+ elseif self.errorCode == self.INVALID_PROTOCOL then
+ return 'Invalid protocol'
+ elseif self.errorCode == self.MISSING_REQUIRED_FIELD then
+ return 'Missing required field'
+ else
+ return 'Default (unknown)'
+ end
+end
+
+TProtocolBase = __TObject:new{
+ __type = 'TProtocolBase',
+ trans
+}
+
+function TProtocolBase:new(obj)
+ if ttype(obj) ~= 'table' then
+ error(ttype(self) .. 'must be initialized with a table')
+ end
+
+ -- Ensure a transport is provided
+ if not obj.trans then
+ error('You must provide ' .. ttype(self) .. ' with a trans')
+ end
+
+ return __TObject.new(self, obj)
+end
+
+function TProtocolBase:writeMessageBegin(name, ttype, seqid) end
+function TProtocolBase:writeMessageEnd() end
+function TProtocolBase:writeStructBegin(name) end
+function TProtocolBase:writeStructEnd() end
+function TProtocolBase:writeFieldBegin(name, ttype, id) end
+function TProtocolBase:writeFieldEnd() end
+function TProtocolBase:writeFieldStop() end
+function TProtocolBase:writeMapBegin(ktype, vtype, size) end
+function TProtocolBase:writeMapEnd() end
+function TProtocolBase:writeListBegin(ttype, size) end
+function TProtocolBase:writeListEnd() end
+function TProtocolBase:writeSetBegin(ttype, size) end
+function TProtocolBase:writeSetEnd() end
+function TProtocolBase:writeBool(bool) end
+function TProtocolBase:writeByte(byte) end
+function TProtocolBase:writeI16(i16) end
+function TProtocolBase:writeI32(i32) end
+function TProtocolBase:writeI64(i64) end
+function TProtocolBase:writeDouble(dub) end
+function TProtocolBase:writeString(str) end
+function TProtocolBase:readMessageBegin() end
+function TProtocolBase:readMessageEnd() end
+function TProtocolBase:readStructBegin() end
+function TProtocolBase:readStructEnd() end
+function TProtocolBase:readFieldBegin() end
+function TProtocolBase:readFieldEnd() end
+function TProtocolBase:readMapBegin() end
+function TProtocolBase:readMapEnd() end
+function TProtocolBase:readListBegin() end
+function TProtocolBase:readListEnd() end
+function TProtocolBase:readSetBegin() end
+function TProtocolBase:readSetEnd() end
+function TProtocolBase:readBool() end
+function TProtocolBase:readByte() end
+function TProtocolBase:readI16() end
+function TProtocolBase:readI32() end
+function TProtocolBase:readI64() end
+function TProtocolBase:readDouble() end
+function TProtocolBase:readString() end
+
+function TProtocolBase:skip(ttype)
+ if type == TType.STOP then
+ return
+ elseif ttype == TType.BOOL then
+ self:readBool()
+ elseif ttype == TType.BYTE then
+ self:readByte()
+ elseif ttype == TType.I16 then
+ self:readI16()
+ elseif ttype == TType.I32 then
+ self:readI32()
+ elseif ttype == TType.I64 then
+ self:readI64()
+ elseif ttype == TType.DOUBLE then
+ self:readDouble()
+ elseif ttype == TType.STRING then
+ self:readString()
+ elseif ttype == TType.STRUCT then
+ local name = self:readStructBegin()
+ while true do
+ local name, ttype, id = self:readFieldBegin()
+ if ttype == TType.STOP then
+ break
+ end
+ self:skip(ttype)
+ self:readFieldEnd()
+ end
+ self:readStructEnd()
+ elseif ttype == TType.MAP then
+ local kttype, vttype, size = self:readMapBegin()
+ for i = 1, size, 1 do
+ self:skip(kttype)
+ self:skip(vttype)
+ end
+ self:readMapEnd()
+ elseif ttype == TType.SET then
+ local ettype, size = self:readSetBegin()
+ for i = 1, size, 1 do
+ self:skip(ettype)
+ end
+ self:readSetEnd()
+ elseif ttype == TType.LIST then
+ local ettype, size = self:readListBegin()
+ for i = 1, size, 1 do
+ self:skip(ettype)
+ end
+ self:readListEnd()
+ end
+end
+
+TProtocolFactory = __TObject:new{
+ __type = 'TProtocolFactory',
+}
+function TProtocolFactory:getProtocol(trans) end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TServer.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TServer.lua b/lib/lua/TServer.lua
new file mode 100644
index 0000000..d6b9cd0
--- /dev/null
+++ b/lib/lua/TServer.lua
@@ -0,0 +1,139 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'Thrift'
+require 'TFramedTransport'
+require 'TBinaryProtocol'
+
+-- TServer
+TServer = __TObject:new{
+ __type = 'TServer'
+}
+
+-- 2 possible constructors
+-- 1. {processor, serverTransport}
+-- 2. {processor, serverTransport, transportFactory, protocolFactory}
+function TServer:new(args)
+ if ttype(args) ~= 'table' then
+ error('TServer must be initialized with a table')
+ end
+ if args.processor == nil then
+ terror('You must provide ' .. ttype(self) .. ' with a processor')
+ end
+ if args.serverTransport == nil then
+ terror('You must provide ' .. ttype(self) .. ' with a serverTransport')
+ end
+
+ -- Create the object
+ local obj = __TObject.new(self, args)
+
+ if obj.transportFactory then
+ obj.inputTransportFactory = obj.transportFactory
+ obj.outputTransportFactory = obj.transportFactory
+ obj.transportFactory = nil
+ else
+ obj.inputTransportFactory = TFramedTransportFactory:new{}
+ obj.outputTransportFactory = obj.inputTransportFactory
+ end
+
+ if obj.protocolFactory then
+ obj.inputProtocolFactory = obj.protocolFactory
+ obj.outputProtocolFactory = obj.protocolFactory
+ obj.protocolFactory = nil
+ else
+ obj.inputProtocolFactory = TBinaryProtocolFactory:new{}
+ obj.outputProtocolFactory = obj.inputProtocolFactory
+ end
+
+ -- Set the __server variable in the handler so we can stop the server
+ obj.processor.handler.__server = self
+
+ return obj
+end
+
+function TServer:setServerEventHandler(handler)
+ self.serverEventHandler = handler
+end
+
+function TServer:_clientBegin(content, iprot, oprot)
+ if self.serverEventHandler and
+ type(self.serverEventHandler.clientBegin) == 'function' then
+ self.serverEventHandler:clientBegin(iprot, oprot)
+ end
+end
+
+function TServer:_preServe()
+ if self.serverEventHandler and
+ type(self.serverEventHandler.preServe) == 'function' then
+ self.serverEventHandler:preServe(self.serverTransport:getSocketInfo())
+ end
+end
+
+function TServer:_handleException(err)
+ if string.find(err, 'TTransportException') == nil then
+ print(err)
+ end
+end
+
+function TServer:serve() end
+function TServer:handle(client)
+ local itrans, otrans, iprot, oprot, ret, err =
+ self.inputTransportFactory:getTransport(client),
+ self.outputTransportFactory:getTransport(client),
+ self.inputProtocolFactory:getProtocol(client),
+ self.outputProtocolFactory:getProtocol(client)
+
+ self:_clientBegin(iprot, oprot)
+ while true do
+ ret, err = pcall(self.processor.process, self.processor, iprot, oprot)
+ if ret == false and err then
+ if not string.find(err, "TTransportException") then
+ self:_handleException(err)
+ end
+ break
+ end
+ end
+ itrans:close()
+ otrans:close()
+end
+
+function TServer:close()
+ self.serverTransport:close()
+end
+
+-- TSimpleServer
+-- Single threaded server that handles one transport (connection)
+TSimpleServer = __TObject:new(TServer, {
+ __type = 'TSimpleServer',
+ __stop = false
+})
+
+function TSimpleServer:serve()
+ self.serverTransport:listen()
+ self:_preServe()
+ while not self.__stop do
+ client = self.serverTransport:accept()
+ self:handle(client)
+ end
+ self:close()
+end
+
+function TSimpleServer:stop()
+ self.__stop = true
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TSocket.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TSocket.lua b/lib/lua/TSocket.lua
new file mode 100644
index 0000000..d71fc1f
--- /dev/null
+++ b/lib/lua/TSocket.lua
@@ -0,0 +1,132 @@
+---- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'TTransport'
+require 'libluasocket'
+
+-- TSocketBase
+TSocketBase = TTransportBase:new{
+ __type = 'TSocketBase',
+ timeout = 1000,
+ host = 'localhost',
+ port = 9090,
+ handle
+}
+
+function TSocketBase:close()
+ if self.handle then
+ self.handle:destroy()
+ self.handle = nil
+ end
+end
+
+-- Returns a table with the fields host and port
+function TSocketBase:getSocketInfo()
+ if self.handle then
+ return self.handle:getsockinfo()
+ end
+ terror(TTransportException:new{errorCode = TTransportException.NOT_OPEN})
+end
+
+function TSocketBase:setTimeout(timeout)
+ if timeout and ttype(timeout) == 'number' then
+ if self.handle then
+ self.handle:settimeout(timeout)
+ end
+ self.timeout = timeout
+ end
+end
+
+-- TSocket
+TSocket = TSocketBase:new{
+ __type = 'TSocket',
+ host = 'localhost',
+ port = 9090
+}
+
+function TSocket:isOpen()
+ if self.handle then
+ return true
+ end
+ return false
+end
+
+function TSocket:open()
+ if self.handle then
+ self:close()
+ end
+
+ -- Create local handle
+ local sock, err = luasocket.create_and_connect(
+ self.host, self.port, self.timeout)
+ if err == nil then
+ self.handle = sock
+ end
+
+ if err then
+ terror(TTransportException:new{
+ message = 'Could not connect to ' .. self.host .. ':' .. self.port
+ .. ' (' .. err .. ')'
+ })
+ end
+end
+
+function TSocket:read(len)
+ local buf = self.handle:receive(self.handle, len)
+ if not buf or string.len(buf) ~= len then
+ terror(TTransportException:new{errorCode = TTransportException.UNKNOWN})
+ end
+ return buf
+end
+
+function TSocket:write(buf)
+ self.handle:send(self.handle, buf)
+end
+
+function TSocket:flush()
+end
+
+-- TServerSocket
+TServerSocket = TSocketBase:new{
+ __type = 'TServerSocket',
+ host = 'localhost',
+ port = 9090
+}
+
+function TServerSocket:listen()
+ if self.handle then
+ self:close()
+ end
+
+ local sock, err = luasocket.create(self.host, self.port)
+ if not err then
+ self.handle = sock
+ else
+ terror(err)
+ end
+ self.handle:settimeout(self.timeout)
+ self.handle:listen()
+end
+
+function TServerSocket:accept()
+ local client, err = self.handle:accept()
+ if err then
+ terror(err)
+ end
+ return TSocket:new({handle = client})
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/TTransport.lua
----------------------------------------------------------------------
diff --git a/lib/lua/TTransport.lua b/lib/lua/TTransport.lua
new file mode 100644
index 0000000..01c7e59
--- /dev/null
+++ b/lib/lua/TTransport.lua
@@ -0,0 +1,93 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+require 'Thrift'
+
+TTransportException = TException:new {
+ UNKNOWN = 0,
+ NOT_OPEN = 1,
+ ALREADY_OPEN = 2,
+ TIMED_OUT = 3,
+ END_OF_FILE = 4,
+ INVALID_FRAME_SIZE = 5,
+ INVALID_TRANSFORM = 6,
+ INVALID_CLIENT_TYPE = 7,
+ errorCode = 0,
+ __type = 'TTransportException'
+}
+
+function TTransportException:__errorCodeToString()
+ if self.errorCode == self.NOT_OPEN then
+ return 'Transport not open'
+ elseif self.errorCode == self.ALREADY_OPEN then
+ return 'Transport already open'
+ elseif self.errorCode == self.TIMED_OUT then
+ return 'Transport timed out'
+ elseif self.errorCode == self.END_OF_FILE then
+ return 'End of file'
+ elseif self.errorCode == self.INVALID_FRAME_SIZE then
+ return 'Invalid frame size'
+ elseif self.errorCode == self.INVALID_TRANSFORM then
+ return 'Invalid transform'
+ elseif self.errorCode == self.INVALID_CLIENT_TYPE then
+ return 'Invalid client type'
+ else
+ return 'Default (unknown)'
+ end
+end
+
+TTransportBase = __TObject:new{
+ __type = 'TTransportBase'
+}
+
+function TTransportBase:isOpen() end
+function TTransportBase:open() end
+function TTransportBase:close() end
+function TTransportBase:read(len) end
+function TTransportBase:readAll(len)
+ local buf, have, chunk = '', 0
+ while have < len do
+ chunk = self:read(len - have)
+ have = have + string.len(chunk)
+ buf = buf .. chunk
+
+ if string.len(chunk) == 0 then
+ terror(TTransportException:new{
+ errorCode = TTransportException.END_OF_FILE
+ })
+ end
+ end
+ return buf
+end
+function TTransportBase:write(buf) end
+function TTransportBase:flush() end
+
+TServerTransportBase = __TObject:new{
+ __type = 'TServerTransportBase'
+}
+function TServerTransportBase:listen() end
+function TServerTransportBase:accept() end
+function TServerTransportBase:close() end
+
+TTransportFactoryBase = __TObject:new{
+ __type = 'TTransportFactoryBase'
+}
+function TTransportFactoryBase:getTransport(trans)
+ return trans
+end
http://git-wip-us.apache.org/repos/asf/thrift/blob/6cf0ffce/lib/lua/Thrift.lua
----------------------------------------------------------------------
diff --git a/lib/lua/Thrift.lua b/lib/lua/Thrift.lua
new file mode 100644
index 0000000..6ff8ecb
--- /dev/null
+++ b/lib/lua/Thrift.lua
@@ -0,0 +1,273 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+---- namespace thrift
+--thrift = {}
+--setmetatable(thrift, {__index = _G}) --> perf hit for accessing global methods
+--setfenv(1, thrift)
+
+package.cpath = package.cpath .. ';bin/?.so' -- TODO FIX
+function ttype(obj)
+ if type(obj) == 'table' and
+ obj.__type and
+ type(obj.__type) == 'string' then
+ return obj.__type
+ end
+ return type(obj)
+end
+
+function terror(e)
+ if e and e.__tostring then
+ error(e:__tostring())
+ return
+ end
+ error(e)
+end
+
+version = 1.0
+
+TType = {
+ STOP = 0,
+ VOID = 1,
+ BOOL = 2,
+ BYTE = 3,
+ I08 = 3,
+ DOUBLE = 4,
+ I16 = 6,
+ I32 = 8,
+ I64 = 10,
+ STRING = 11,
+ UTF7 = 11,
+ STRUCT = 12,
+ MAP = 13,
+ SET = 14,
+ LIST = 15,
+ UTF8 = 16,
+ UTF16 = 17
+}
+
+TMessageType = {
+ CALL = 1,
+ REPLY = 2,
+ EXCEPTION = 3,
+ ONEWAY = 4
+}
+
+-- Recursive __index function to achive inheritance
+function __tobj_index(self, key)
+ local v = rawget(self, key)
+ if v ~= nil then
+ return v
+ end
+
+ local p = rawget(self, '__parent')
+ if p then
+ return __tobj_index(p, key)
+ end
+
+ return nil
+end
+
+-- Basic Thrift-Lua Object
+__TObject = {
+ __type = '__TObject',
+ __mt = {
+ __index = __tobj_index
+ }
+}
+function __TObject:new(init_obj)
+ local obj = {}
+ if ttype(obj) == 'table' then
+ obj = init_obj
+ end
+
+ -- Use the __parent key and the __index function to achieve inheritance
+ obj.__parent = self
+ setmetatable(obj, __TObject.__mt)
+ return obj
+end
+
+-- Return a string representation of any lua variable
+function thrift_print_r(t)
+ local ret = ''
+ local ltype = type(t)
+ if (ltype == 'table') then
+ ret = ret .. '{ '
+ for key,value in pairs(t) do
+ ret = ret .. tostring(key) .. '=' .. thrift_print_r(value) .. ' '
+ end
+ ret = ret .. '}'
+ elseif ltype == 'string' then
+ ret = ret .. "'" .. tostring(t) .. "'"
+ else
+ ret = ret .. tostring(t)
+ end
+ return ret
+end
+
+-- Basic Exception
+TException = __TObject:new{
+ message,
+ errorCode,
+ __type = 'TException'
+}
+function TException:__tostring()
+ if self.message then
+ return string.format('%s: %s', self.__type, self.message)
+ else
+ local message
+ if self.errorCode and self.__errorCodeToString then
+ message = string.format('%d: %s', self.errorCode, self:__errorCodeToString())
+ else
+ message = thrift_print_r(self)
+ end
+ return string.format('%s:%s', self.__type, message)
+ end
+end
+
+TApplicationException = TException:new{
+ UNKNOWN = 0,
+ UNKNOWN_METHOD = 1,
+ INVALID_MESSAGE_TYPE = 2,
+ WRONG_METHOD_NAME = 3,
+ BAD_SEQUENCE_ID = 4,
+ MISSING_RESULT = 5,
+ INTERNAL_ERROR = 6,
+ PROTOCOL_ERROR = 7,
+ INVALID_TRANSFORM = 8,
+ INVALID_PROTOCOL = 9,
+ UNSUPPORTED_CLIENT_TYPE = 10,
+ errorCode = 0,
+ __type = 'TApplicationException'
+}
+
+function TApplicationException:__errorCodeToString()
+ if self.errorCode == self.UNKNOWN_METHOD then
+ return 'Unknown method'
+ elseif self.errorCode == self.INVALID_MESSAGE_TYPE then
+ return 'Invalid message type'
+ elseif self.errorCode == self.WRONG_METHOD_NAME then
+ return 'Wrong method name'
+ elseif self.errorCode == self.BAD_SEQUENCE_ID then
+ return 'Bad sequence ID'
+ elseif self.errorCode == self.MISSING_RESULT then
+ return 'Missing result'
+ elseif self.errorCode == self.INTERNAL_ERROR then
+ return 'Internal error'
+ elseif self.errorCode == self.PROTOCOL_ERROR then
+ return 'Protocol error'
+ elseif self.errorCode == self.INVALID_TRANSFORM then
+ return 'Invalid transform'
+ elseif self.errorCode == self.INVALID_PROTOCOL then
+ return 'Invalid protocol'
+ elseif self.errorCode == self.UNSUPPORTED_CLIENT_TYPE then
+ return 'Unsupported client type'
+ else
+ return 'Default (unknown)'
+ end
+end
+
+function TException:read(iprot)
+ iprot:readStructBegin()
+ while true do
+ local fname, ftype, fid = iprot:readFieldBegin()
+ if ftype == TType.STOP then
+ break
+ elseif fid == 1 then
+ if ftype == TType.STRING then
+ self.message = iprot:readString()
+ else
+ iprot:skip(ftype)
+ end
+ elseif fid == 2 then
+ if ftype == TType.I32 then
+ self.errorCode = iprot:readI32()
+ else
+ iprot:skip(ftype)
+ end
+ else
+ iprot:skip(ftype)
+ end
+ iprot:readFieldEnd()
+ end
+ iprot:readStructEnd()
+end
+
+function TException:write(oprot)
+ oprot:writeStructBegin('TApplicationException')
+ if self.message then
+ oprot:writeFieldBegin('message', TType.STRING, 1)
+ oprot:writeString(self.message)
+ oprot:writeFieldEnd()
+ end
+ if self.errorCode then
+ oprot:writeFieldBegin('type', TType.I32, 2)
+ oprot:writeI32(self.errorCode)
+ oprot:writeFieldEnd()
+ end
+ oprot:writeFieldStop()
+ oprot:writeStructEnd()
+end
+
+-- Basic Client (used in generated lua code)
+__TClient = __TObject:new{
+ __type = '__TClient',
+ _seqid = 0
+}
+function __TClient:new(obj)
+ if ttype(obj) ~= 'table' then
+ error('TClient must be initialized with a table')
+ end
+
+ -- Set iprot & oprot
+ if obj.protocol then
+ obj.iprot = obj.protocol
+ obj.oprot = obj.protocol
+ obj.protocol = nil
+ elseif not obj.iprot then
+ error('You must provide ' .. ttype(self) .. ' with an iprot')
+ end
+ if not obj.oprot then
+ obj.oprot = obj.iprot
+ end
+
+ return __TObject.new(self, obj)
+end
+
+function __TClient:close()
+ self.iprot.trans:close()
+ self.oprot.trans:close()
+end
+
+-- Basic Processor (used in generated lua code)
+__TProcessor = __TObject:new{
+ __type = '__TProcessor'
+}
+function __TProcessor:new(obj)
+ if ttype(obj) ~= 'table' then
+ error('TProcessor must be initialized with a table')
+ end
+
+ -- Ensure a handler is provided
+ if not obj.handler then
+ error('You must provide ' .. ttype(self) .. ' with a handler')
+ end
+
+ return __TObject.new(self, obj)
+end