Thrift test improvements, tests for both inline and normal PHP code gen
Summary: So you can A/B test and see 6ms vs. 4ms response time :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664773 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/cpp/Makefile.thrift b/test/cpp/Makefile.thrift
index f95401c..ddd6b2e 100644
--- a/test/cpp/Makefile.thrift
+++ b/test/cpp/Makefile.thrift
@@ -6,14 +6,15 @@
# Default target is everything
ifndef thrift_home
-thrift_home=../../build
+thrift_home=/usr/local
endif #thrift_home
target: all
ifndef boost_home
boost_home=../../../../../thirdparty/boost_1_33_1
-endif #thrift_home
+boost_home=/usr/local/include/boost-1_33_1
+endif #boost_home
target: all
include_paths = $(thrift_home)/include/thrift \
@@ -30,8 +31,8 @@
LD = g++
# Compiler flags
-DCFL = -Wall -O3 -g -I../cpp-gen $(include_flags) -L$(thrift_home)/lib -lthrift
-CFL = -Wall -O3 -I../cpp-gen $(include_flags) -L$(thrift_home)/lib -lthrift
+DCFL = -Wall -O3 -g -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
+CFL = -Wall -O3 -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
all: server client
@@ -41,16 +42,16 @@
$(THRIFT) --cpp ../ThriftTest.thrift
server-debug: stubs
- g++ -o TestServer $(DCFL) src/TestServer.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestServer $(DCFL) src/TestServer.cc ./gen-cpp/ThriftTest.cc
client-debug: stubs
- g++ -o TestClient $(DCFL) src/TestClient.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestClient $(DCFL) src/TestClient.cc ./gen-cpp/ThriftTest.cc
server: stubs
- g++ -o TestServer $(CFL) src/TestServer.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestServer $(CFL) src/TestServer.cc ./gen-cpp/ThriftTest.cc
client: stubs
- g++ -o TestClient $(CFL) src/TestClient.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestClient $(CFL) src/TestClient.cc ./gen-cpp/ThriftTest.cc
clean:
rm -fr TestServer TestClient ../cpp-gen
diff --git a/test/cpp/src/TestClient.cc b/test/cpp/src/TestClient.cc
index 2e2f61b..d340e26 100644
--- a/test/cpp/src/TestClient.cc
+++ b/test/cpp/src/TestClient.cc
@@ -98,7 +98,7 @@
*/
printf("testI64(-34359738368)");
int64_t i64 = testClient.testI64(-34359738368LL);
- printf(" = %lld\n", i64);
+ printf(" = %ld\n", i64);
/**
* STRUCT TEST
@@ -110,7 +110,7 @@
out.i32_thing = -3;
out.i64_thing = -5;
Xtruct in = testClient.testStruct(out);
- printf(" = {\"%s\", %d, %d, %lld}\n",
+ printf(" = {\"%s\", %d, %d, %ld}\n",
in.string_thing.c_str(),
(int)in.byte_thing,
in.i32_thing,
@@ -126,7 +126,7 @@
out2.i32_thing = 5;
Xtruct2 in2 = testClient.testNest(out2);
in = in2.struct_thing;
- printf(" = {%d, {\"%s\", %d, %d, %lld}, %d}\n",
+ printf(" = {%d, {\"%s\", %d, %d, %ld}, %d}\n",
in2.byte_thing,
in.string_thing.c_str(),
(int)in.byte_thing,
@@ -258,7 +258,7 @@
*/
printf("testTypedef(309858235082523)");
UserId uid = testClient.testTypedef(309858235082523LL);
- printf(" = %lld\n", uid);
+ printf(" = %ld\n", uid);
/**
* NESTED MAP TEST
@@ -293,7 +293,7 @@
printf(" = {");
map<UserId, map<Numberz,Insanity> >::const_iterator i_iter;
for (i_iter = whoa.begin(); i_iter != whoa.end(); ++i_iter) {
- printf("%lld => {", i_iter->first);
+ printf("%ld => {", i_iter->first);
map<Numberz,Insanity>::const_iterator i2_iter;
for (i2_iter = i_iter->second.begin();
i2_iter != i_iter->second.end();
@@ -303,7 +303,7 @@
map<Numberz, UserId>::const_iterator um;
printf("{");
for (um = userMap.begin(); um != userMap.end(); ++um) {
- printf("%d => %lld, ", um->first, um->second);
+ printf("%d => %ld, ", um->first, um->second);
}
printf("}, ");
@@ -311,7 +311,7 @@
list<Xtruct>::const_iterator x;
printf("{");
for (x = xtructs.begin(); x != xtructs.end(); ++x) {
- printf("{\"%s\", %d, %d, %lld}, ",
+ printf("{\"%s\", %d, %d, %ld}, ",
x->string_thing.c_str(),
(int)x->byte_thing,
x->i32_thing,
@@ -350,7 +350,7 @@
printf("testClient.testMultiException(\"Xception\", \"test 1\") =>");
Xtruct result = testClient.testMultiException("Xception", "test 1");
printf(" result\nFAILURE\n");
- } catch(Xception& e) {
+ } catch(Xception& e) {
printf(" {%u, \"%s\"}\n", e.errorCode, e.message.c_str());
}
@@ -359,7 +359,7 @@
Xtruct result = testClient.testMultiException("Xception2", "test 2");
printf(" result\nFAILURE\n");
- } catch(Xception2& e) {
+ } catch(Xception2& e) {
printf(" {%u, {\"%s\"}}\n", e.errorCode, e.struct_thing.string_thing.c_str());
}
@@ -372,7 +372,7 @@
}
uint64_t stop = now();
- printf("Total time: %llu us\n", stop-start);
+ printf("Total time: %lu us\n", stop-start);
bufferedSocket->close();
}
diff --git a/test/cpp/src/TestServer.cc b/test/cpp/src/TestServer.cc
index 9e5cf91..baf2ae5 100644
--- a/test/cpp/src/TestServer.cc
+++ b/test/cpp/src/TestServer.cc
@@ -33,7 +33,7 @@
return thing;
}
- uint8_t testByte(uint8_t thing) {
+ int8_t testByte(int8_t thing) {
printf("testByte(%d)\n", (int)thing);
return thing;
}
@@ -44,12 +44,12 @@
}
int64_t testI64(int64_t thing) {
- printf("testI64(%lld)\n", thing);
+ printf("testI64(%ld)\n", thing);
return thing;
}
Xtruct testStruct(Xtruct thing) {
- printf("testStruct({\"%s\", %d, %d, %lld})\n",
+ printf("testStruct({\"%s\", %d, %d, %ld})\n",
thing.string_thing.c_str(),
(int)thing.byte_thing,
thing.i32_thing,
@@ -59,7 +59,7 @@
Xtruct2 testNest(Xtruct2 nest) {
Xtruct thing = nest.struct_thing;
- printf("testNest({%d, {\"%s\", %d, %d, %lld}, %d})\n",
+ printf("testNest({%d, {\"%s\", %d, %d, %ld}, %d})\n",
(int)nest.byte_thing,
thing.string_thing.c_str(),
(int)thing.byte_thing,
@@ -123,7 +123,7 @@
}
UserId testTypedef(UserId thing) {
- printf("testTypedef(%lld)\n", thing);
+ printf("testTypedef(%ld)\n", thing);
return thing;
}
@@ -183,7 +183,7 @@
printf(" = {");
map<UserId, map<Numberz,Insanity> >::const_iterator i_iter;
for (i_iter = insane.begin(); i_iter != insane.end(); ++i_iter) {
- printf("%lld => {", i_iter->first);
+ printf("%ld => {", i_iter->first);
map<Numberz,Insanity>::const_iterator i2_iter;
for (i2_iter = i_iter->second.begin();
i2_iter != i_iter->second.end();
@@ -193,7 +193,7 @@
map<Numberz, UserId>::const_iterator um;
printf("{");
for (um = userMap.begin(); um != userMap.end(); ++um) {
- printf("%d => %lld, ", um->first, um->second);
+ printf("%d => %ld, ", um->first, um->second);
}
printf("}, ");
@@ -201,7 +201,7 @@
list<Xtruct>::const_iterator x;
printf("{");
for (x = xtructs.begin(); x != xtructs.end(); ++x) {
- printf("{\"%s\", %d, %d, %lld}, ",
+ printf("{\"%s\", %d, %d, %ld}, ",
x->string_thing.c_str(),
(int)x->byte_thing,
x->i32_thing,
@@ -218,7 +218,7 @@
return insane;
}
- Xtruct testMulti(uint8_t arg0, int32_t arg1, uint64_t arg2, std::map<int16_t, std::string> arg3, Numberz arg4, UserId arg5) {
+ Xtruct testMulti(int8_t arg0, int32_t arg1, int64_t arg2, std::map<int16_t, std::string> arg3, Numberz arg4, UserId arg5) {
printf("testMulti()\n");
Xtruct hello;
@@ -230,9 +230,9 @@
return hello;
}
- virtual void testException(std::string arg) throw(struct thrift::test::Xception) {
+ void testException(std::string arg) throw(Xception) {
printf("testException(%s)\n", arg.c_str());
- if(arg.compare("Xception") == 0) {
+ if (arg.compare("Xception") == 0) {
Xception e;
e.errorCode = 1001;
e.message = "This is an Xception";
@@ -244,7 +244,7 @@
}
}
- virtual struct Xtruct testMultiException(std::string arg0, std::string arg1) throw(struct Xception, struct Xception2) {
+ Xtruct testMultiException(std::string arg0, std::string arg1) throw(Xception, Xception2) {
printf("testMultiException(%s, %s)\n", arg0.c_str(), arg1.c_str());
@@ -357,7 +357,7 @@
// Transport
shared_ptr<TServerSocket> serverSocket(new TServerSocket(port));
- if(serverType == "simple") {
+ if (serverType == "simple") {
// Server
TSimpleServer simpleServer(testServer,
@@ -367,7 +367,7 @@
printf("Starting the server on port %d...\n", port);
simpleServer.run();
- } else if(serverType == "thread-pool") {
+ } else if (serverType == "thread-pool") {
shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(workerCount);