Rev 2 of Thrift, the Pillar successor
Summary: End-to-end communications and serialization in C++ is working
Reviewed By: aditya
Test Plan: See the new top-level test/ folder. It vaguely resembles a unit test, though it could be more automated.
Revert Plan: Revertible
Notes: Still a LOT of optimization work to be done on the generated C++ code, which should be using dynamic memory in a number of places. Next major task is writing the PHP/Java/Python generators.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664712 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/cpp/TestServer.cc b/test/cpp/TestServer.cc
new file mode 100644
index 0000000..8138166
--- /dev/null
+++ b/test/cpp/TestServer.cc
@@ -0,0 +1,254 @@
+#include <stdio.h>
+#include "protocol/TBinaryProtocol.h"
+#include "server/TSimpleServer.h"
+#include "transport/TServerSocket.h"
+#include "gen-cpp/ThriftTest.h"
+using namespace std;
+
+class TestServer : public ThriftTestServerIf {
+ public:
+ TestServer(TProtocol* protocol) :
+ ThriftTestServerIf(protocol) {}
+
+ void testVoid() {
+ printf("testVoid()\n");
+ }
+
+ string testString(string thing) {
+ printf("testString(\"%s\")\n", thing.c_str());
+ return thing;
+ }
+
+ uint8_t testByte(uint8_t thing) {
+ printf("testByte(%d)\n", (int)thing);
+ return thing;
+ }
+
+ uint32_t testU32(uint32_t thing) {
+ printf("testU32(%u)\n", thing);
+ return thing;
+ }
+
+ int32_t testI32(int32_t thing) {
+ printf("testI32(%d)\n", thing);
+ return thing;
+ }
+
+ uint64_t testU64(uint64_t thing) {
+ printf("testU64(%lu)\n", thing);
+ return thing;
+ }
+
+ int64_t testI64(int64_t thing) {
+ printf("testI64(%ld)\n", thing);
+ return thing;
+ }
+
+ Xtruct testStruct(Xtruct thing) {
+ printf("testStruct({\"%s\", %d, %u, %d, %lu, %ld})\n",
+ thing.string_thing.c_str(),
+ (int)thing.byte_thing,
+ thing.u32_thing,
+ thing.i32_thing,
+ thing.u64_thing,
+ thing.i64_thing);
+ return thing;
+ }
+
+ Xtruct2 testNest(Xtruct2 nest) {
+ Xtruct thing = nest.struct_thing;
+ printf("testNest({%d, {\"%s\", %d, %u, %d, %lu, %ld}, %d})\n",
+ (int)nest.byte_thing,
+ thing.string_thing.c_str(),
+ (int)thing.byte_thing,
+ thing.u32_thing,
+ thing.i32_thing,
+ thing.u64_thing,
+ thing.i64_thing,
+ nest.i32_thing);
+ return nest;
+ }
+
+ map<int32_t, int32_t> testMap(map<int32_t, int32_t> thing) {
+ printf("testMap({");
+ map<int32_t, int32_t>::const_iterator m_iter;
+ bool first = true;
+ for (m_iter = thing.begin(); m_iter != thing.end(); ++m_iter) {
+ if (first) {
+ first = false;
+ } else {
+ printf(", ");
+ }
+ printf("%d => %d", m_iter->first, m_iter->second);
+ }
+ printf("})\n");
+ return thing;
+ }
+
+ set<int32_t> testSet(set<int32_t> thing) {
+ printf("testSet({");
+ set<int32_t>::const_iterator s_iter;
+ bool first = true;
+ for (s_iter = thing.begin(); s_iter != thing.end(); ++s_iter) {
+ if (first) {
+ first = false;
+ } else {
+ printf(", ");
+ }
+ printf("%d", *s_iter);
+ }
+ printf("})\n");
+ return thing;
+ }
+
+ list<int32_t> testList(list<int32_t> thing) {
+ printf("testList({");
+ list<int32_t>::const_iterator l_iter;
+ bool first = true;
+ for (l_iter = thing.begin(); l_iter != thing.end(); ++l_iter) {
+ if (first) {
+ first = false;
+ } else {
+ printf(", ");
+ }
+ printf("%d", *l_iter);
+ }
+ printf("})\n");
+ return thing;
+ }
+
+ Numberz testEnum(Numberz thing = 0) {
+ printf("testEnum(%d)\n", thing);
+ return thing;
+ }
+
+ UserId testTypedef(UserId thing = 0) {
+ printf("testTypedef(%lu)\n", thing);
+ return thing;
+ }
+
+ map<int32_t, map<int32_t,int32_t> > testMapMap(int32_t hello) {
+ printf("testMapMap(%d)\n", hello);
+ map<int32_t, map<int32_t,int32_t> > mapmap;
+
+ map<int32_t,int32_t> pos;
+ map<int32_t,int32_t> neg;
+ for (int i = 1; i < 5; i++) {
+ pos.insert(make_pair(i,i));
+ neg.insert(make_pair(-i,-i));
+ }
+
+ mapmap.insert(make_pair(4, pos));
+ mapmap.insert(make_pair(-4, neg));
+
+ return mapmap;
+ }
+
+ map<UserId, map<Numberz,Insanity> > testInsanity(Insanity argument) {
+ printf("testInsanity()\n");
+
+ Xtruct hello;
+ hello.string_thing = "Hello2";
+ hello.byte_thing = 2;
+ hello.u32_thing = 2;
+ hello.i32_thing = 2;
+ hello.u64_thing = 2;
+ hello.i64_thing = 2;
+
+ Xtruct goodbye;
+ goodbye.string_thing = "Goodbye4";
+ goodbye.byte_thing = 4;
+ goodbye.u32_thing = 4;
+ goodbye.i32_thing = 4;
+ goodbye.u64_thing = 4;
+ goodbye.i64_thing = 4;
+
+ Insanity crazy;
+ crazy.userMap.insert(make_pair(EIGHT, 8));
+ crazy.xtructs.push_back(goodbye);
+
+ Insanity looney;
+ crazy.userMap.insert(make_pair(FIVE, 5));
+ crazy.xtructs.push_back(hello);
+
+ map<Numberz, Insanity> first_map;
+ map<Numberz, Insanity> second_map;
+
+ first_map.insert(make_pair(TWO, crazy));
+ first_map.insert(make_pair(THREE, crazy));
+
+ second_map.insert(make_pair(SIX, looney));
+
+ map<UserId, map<Numberz,Insanity> > insane;
+ insane.insert(make_pair(1, first_map));
+ insane.insert(make_pair(2, second_map));
+
+ printf("return");
+ printf(" = {");
+ map<UserId, map<Numberz,Insanity> >::const_iterator i_iter;
+ for (i_iter = insane.begin(); i_iter != insane.end(); ++i_iter) {
+ printf("%lu => {", i_iter->first);
+ map<Numberz,Insanity>::const_iterator i2_iter;
+ for (i2_iter = i_iter->second.begin();
+ i2_iter != i_iter->second.end();
+ ++i2_iter) {
+ printf("%d => {", i2_iter->first);
+ map<Numberz, UserId> userMap = i2_iter->second.userMap;
+ map<Numberz, UserId>::const_iterator um;
+ printf("{");
+ for (um = userMap.begin(); um != userMap.end(); ++um) {
+ printf("%d => %lu, ", um->first, um->second);
+ }
+ printf("}, ");
+
+ list<Xtruct> xtructs = i2_iter->second.xtructs;
+ list<Xtruct>::const_iterator x;
+ printf("{");
+ for (x = xtructs.begin(); x != xtructs.end(); ++x) {
+ printf("{\"%s\", %d, %u, %d, %lu, %ld}, ",
+ x->string_thing.c_str(),
+ (int)x->byte_thing,
+ x->u32_thing,
+ x->i32_thing,
+ x->u64_thing,
+ x->i64_thing);
+ }
+ printf("}");
+
+ printf("}, ");
+ }
+ printf("}, ");
+ }
+ printf("}\n");
+
+ return insane;
+ }
+
+};
+
+int main(int argc, char **argv) {
+ int port = 9090;
+ if (argc > 1) {
+ port = atoi(argv[1]);
+ }
+
+ // Dispatcher
+ TBinaryProtocol binaryProtocol;
+ TestServer testServer(&binaryProtocol);
+
+ // Options
+ TServerOptions serverOptions;
+
+ // Transport
+ TServerSocket serverSocket(port);
+
+ // Server
+ TSimpleServer simpleServer(&testServer,
+ &serverOptions,
+ &serverSocket);
+
+ printf("Starting the server on port %d...\n", port);
+ simpleServer.run();
+ printf("done.\n");
+ return 0;
+}