THRIFT-5868: UUID Support for TCompactProtocol
Client: cpp
Patch: Carel Combrink
This closes #3137
diff --git a/lib/cpp/test/AllProtocolTests.tcc b/lib/cpp/test/AllProtocolTests.tcc
index 80a4ea0..cb98917 100644
--- a/lib/cpp/test/AllProtocolTests.tcc
+++ b/lib/cpp/test/AllProtocolTests.tcc
@@ -25,6 +25,7 @@
#include <thrift/protocol/TBinaryProtocol.h>
#include <thrift/transport/TBufferTransports.h>
#include <thrift/Thrift.h>
+#include <thrift/TUuid.h>
#include "GenericHelpers.h"
@@ -208,6 +209,9 @@
testNaked<TProto, std::string>("a bit longer than the smallest possible");
testNaked<TProto, std::string>("\x1\x2\x3\x4\x5\x6\x7\x8\x9\xA"); // kinda binary test
+ testNaked<TProto, TUuid>(TUuid("5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"));
+ testField<TProto, T_UUID, TUuid>(TUuid("5e2ab188-1726-4e75-a04f-1ed9a6a89c4c"));
+
testField<TProto, T_STRING, std::string>("");
testField<TProto, T_STRING, std::string>("short");
testField<TProto, T_STRING, std::string>("borderlinetiny");
diff --git a/lib/cpp/test/GenericHelpers.h b/lib/cpp/test/GenericHelpers.h
index bcef9f2..1eed4e2 100644
--- a/lib/cpp/test/GenericHelpers.h
+++ b/lib/cpp/test/GenericHelpers.h
@@ -23,6 +23,7 @@
#include <thrift/protocol/TProtocol.h>
#include <memory>
#include <thrift/Thrift.h>
+#include <thrift/TUuid.h>
/* ClassName Helper for cleaner exceptions */
class ClassNames {
@@ -57,6 +58,10 @@
const char* ClassNames::getName<std::string>() {
return "string";
}
+template <>
+const char* ClassNames::getName<apache::thrift::TUuid>() {
+ return "uuid";
+}
/* Generic Protocol I/O function for tests */
class GenericIO {
@@ -87,6 +92,10 @@
return proto->writeString(val);
}
+ static uint32_t write(std::shared_ptr<apache::thrift::protocol::TProtocol> proto, const apache::thrift::TUuid& val) {
+ return proto->writeUUID(val);
+ }
+
/* Read functions */
static uint32_t read(std::shared_ptr<apache::thrift::protocol::TProtocol> proto, int8_t& val) { return proto->readByte(val); }
@@ -102,6 +111,10 @@
static uint32_t read(std::shared_ptr<apache::thrift::protocol::TProtocol> proto, std::string& val) {
return proto->readString(val);
}
+
+ static uint32_t read(std::shared_ptr<apache::thrift::protocol::TProtocol> proto, apache::thrift::TUuid& val) {
+ return proto->readUUID(val);
+ }
};
#endif