Thrift Binary protocol improvements and application exceptions
Summary: Add application exceptions for unknown methods etc, and also let binary protocol support size limits on containers and strings
Reviewed By: aditya, xp-wayne
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665003 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/transport/TFileTransport.h b/lib/cpp/src/transport/TFileTransport.h
index 237234e..09cc531 100644
--- a/lib/cpp/src/transport/TFileTransport.h
+++ b/lib/cpp/src/transport/TFileTransport.h
@@ -336,7 +336,7 @@
class TEOFException : public facebook::thrift::TTransportException {
public:
TEOFException():
- facebook::thrift::TTransportException(TTX_EOF) {};
+ facebook::thrift::TTransportException(TTransportException::END_OF_FILE) {};
};
diff --git a/lib/cpp/src/transport/TServerSocket.cpp b/lib/cpp/src/transport/TServerSocket.cpp
index 8d5e5e4..00860cc 100644
--- a/lib/cpp/src/transport/TServerSocket.cpp
+++ b/lib/cpp/src/transport/TServerSocket.cpp
@@ -42,7 +42,7 @@
if (serverSocket_ == -1) {
perror("TServerSocket::listen() socket");
close();
- throw TTransportException(TTX_NOT_OPEN, "Could not create server socket.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not create server socket.");
}
// Set reusaddress to prevent 2MSL delay on accept
@@ -51,7 +51,7 @@
&one, sizeof(one))) {
perror("TServerSocket::listen() SO_REUSEADDR");
close();
- throw TTransportException(TTX_NOT_OPEN, "Could not set SO_REUSEADDR");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not set SO_REUSEADDR");
}
// Defer accept
@@ -60,7 +60,7 @@
&one, sizeof(one))) {
perror("TServerSocket::listen() TCP_DEFER_ACCEPT");
close();
- throw TTransportException(TTX_NOT_OPEN, "Could not set TCP_DEFER_ACCEPT");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not set TCP_DEFER_ACCEPT");
}
#endif // #ifdef TCP_DEFER_ACCEPT
@@ -70,7 +70,7 @@
&ling, sizeof(ling))) {
close();
perror("TServerSocket::listen() SO_LINGER");
- throw TTransportException(TTX_NOT_OPEN, "Could not set SO_LINGER");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not set SO_LINGER");
}
// TCP Nodelay, speed over bandwidth
@@ -78,7 +78,7 @@
&one, sizeof(one))) {
close();
perror("setsockopt TCP_NODELAY");
- throw TTransportException(TTX_NOT_OPEN, "Could not set TCP_NODELAY");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not set TCP_NODELAY");
}
// Bind to a port
@@ -92,14 +92,14 @@
sprintf(errbuf, "TServerSocket::listen() BIND %d", port_);
perror(errbuf);
close();
- throw TTransportException(TTX_NOT_OPEN, "Could not bind");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not bind");
}
// Call listen
if (-1 == ::listen(serverSocket_, acceptBacklog_)) {
perror("TServerSocket::listen() LISTEN");
close();
- throw TTransportException(TTX_NOT_OPEN, "Could not listen");
+ throw TTransportException(TTransportException::NOT_OPEN, "Could not listen");
}
// The socket is now listening!
@@ -107,7 +107,7 @@
shared_ptr<TTransport> TServerSocket::acceptImpl() {
if (serverSocket_ < 0) {
- throw TTransportException(TTX_NOT_OPEN, "TServerSocket not listening");
+ throw TTransportException(TTransportException::NOT_OPEN, "TServerSocket not listening");
}
struct sockaddr_in clientAddress;
@@ -118,7 +118,7 @@
if (clientSocket < 0) {
perror("TServerSocket::accept()");
- throw TTransportException(TTX_UNKNOWN, "ERROR:" + errno);
+ throw TTransportException(TTransportException::UNKNOWN, "ERROR:" + errno);
}
shared_ptr<TSocket> client(new TSocket(clientSocket));
diff --git a/lib/cpp/src/transport/TSocket.cpp b/lib/cpp/src/transport/TSocket.cpp
index 9df78a1..58bb9f4 100644
--- a/lib/cpp/src/transport/TSocket.cpp
+++ b/lib/cpp/src/transport/TSocket.cpp
@@ -92,7 +92,7 @@
if (r == -1) {
perror("TSocket::peek()");
close();
- throw TTransportException(TTX_UNKNOWN, "recv() ERROR:" + errno);
+ throw TTransportException(TTransportException::UNKNOWN, "recv() ERROR:" + errno);
}
return (r > 0);
}
@@ -103,7 +103,7 @@
if (socket_ == -1) {
perror("TSocket::open() socket");
close();
- throw TTransportException(TTX_NOT_OPEN, "socket() ERROR:" + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "socket() ERROR:" + errno);
}
// Send timeout
@@ -135,7 +135,7 @@
if (host_entry == NULL) {
perror("TSocket: dns error: failed call to gethostbyname.");
close();
- throw TTransportException(TTX_NOT_OPEN, "gethostbyname() failed");
+ throw TTransportException(TTransportException::NOT_OPEN, "gethostbyname() failed");
}
addr.sin_port = htons(port_);
@@ -168,7 +168,7 @@
char buff[1024];
sprintf(buff, "TSocket::open() connect %s %d", host_.c_str(), port_);
perror(buff);
- throw TTransportException(TTX_NOT_OPEN, "open() ERROR: " + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "open() ERROR: " + errno);
}
fd_set fds;
@@ -185,22 +185,22 @@
if (ret2 == -1) {
close();
perror("TSocket::open() getsockopt SO_ERROR");
- throw TTransportException(TTX_NOT_OPEN, "open() ERROR: " + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "open() ERROR: " + errno);
}
if (val == 0) {
goto done;
}
close();
perror("TSocket::open() SO_ERROR was set");
- throw TTransportException(TTX_NOT_OPEN, "open() ERROR: " + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "open() ERROR: " + errno);
} else if (ret == 0) {
close();
perror("TSocket::open() timeed out");
- throw TTransportException(TTX_NOT_OPEN, "open() ERROR: " + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "open() ERROR: " + errno);
} else {
close();
perror("TSocket::open() select error");
- throw TTransportException(TTX_NOT_OPEN, "open() ERROR: " + errno);
+ throw TTransportException(TTransportException::NOT_OPEN, "open() ERROR: " + errno);
}
done:
@@ -218,7 +218,7 @@
uint32_t TSocket::read(uint8_t* buf, uint32_t len) {
if (socket_ < 0) {
- throw TTransportException(TTX_NOT_OPEN, "Called read on non-open socket");
+ throw TTransportException(TTransportException::NOT_OPEN, "Called read on non-open socket");
}
uint32_t retries = 0;
@@ -246,21 +246,21 @@
// If we disconnect with no linger time
if (errno == ECONNRESET) {
- throw TTransportException(TTX_NOT_OPEN, "ECONNRESET");
+ throw TTransportException(TTransportException::NOT_OPEN, "ECONNRESET");
}
// This ish isn't open
if (errno == ENOTCONN) {
- throw TTransportException(TTX_NOT_OPEN, "ENOTCONN");
+ throw TTransportException(TTransportException::NOT_OPEN, "ENOTCONN");
}
// Timed out!
if (errno == ETIMEDOUT) {
- throw TTransportException(TTX_TIMED_OUT, "ETIMEDOUT");
+ throw TTransportException(TTransportException::TIMED_OUT, "ETIMEDOUT");
}
// Some other error, whatevz
- throw TTransportException(TTX_UNKNOWN, "ERROR:" + errno);
+ throw TTransportException(TTransportException::UNKNOWN, "ERROR:" + errno);
}
// The remote host has closed the socket
@@ -275,7 +275,7 @@
void TSocket::write(const uint8_t* buf, uint32_t len) {
if (socket_ < 0) {
- throw TTransportException(TTX_NOT_OPEN, "Called write on non-open socket");
+ throw TTransportException(TTransportException::NOT_OPEN, "Called write on non-open socket");
}
uint32_t sent = 0;
@@ -296,26 +296,26 @@
if (b < 0) {
if (errno == EPIPE) {
close();
- throw TTransportException(TTX_NOT_OPEN, "EPIPE");
+ throw TTransportException(TTransportException::NOT_OPEN, "EPIPE");
}
if (errno == ECONNRESET) {
close();
- throw TTransportException(TTX_NOT_OPEN, "ECONNRESET");
+ throw TTransportException(TTransportException::NOT_OPEN, "ECONNRESET");
}
if (errno == ENOTCONN) {
close();
- throw TTransportException(TTX_NOT_OPEN, "ENOTCONN");
+ throw TTransportException(TTransportException::NOT_OPEN, "ENOTCONN");
}
perror("TSocket::write() send < 0");
- throw TTransportException(TTX_UNKNOWN, "ERROR:" + errno);
+ throw TTransportException(TTransportException::UNKNOWN, "ERROR:" + errno);
}
// Fail on blocked send
if (b == 0) {
- throw TTransportException(TTX_NOT_OPEN, "Socket send returned 0.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Socket send returned 0.");
}
sent += b;
}
diff --git a/lib/cpp/src/transport/TTransport.h b/lib/cpp/src/transport/TTransport.h
index 02dd89c..4f49d99 100644
--- a/lib/cpp/src/transport/TTransport.h
+++ b/lib/cpp/src/transport/TTransport.h
@@ -47,14 +47,14 @@
* @throws TTransportException if opening failed
*/
virtual void open() {
- throw TTransportException(TTX_NOT_OPEN, "Cannot open base TTransport.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Cannot open base TTransport.");
}
/**
* Closes the transport.
*/
virtual void close() {
- throw TTransportException(TTX_NOT_OPEN, "Cannot close base TTransport.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Cannot close base TTransport.");
}
/**
@@ -66,7 +66,7 @@
* @throws TTransportException If an error occurs
*/
virtual uint32_t read(uint8_t* buf, uint32_t len) {
- throw TTransportException(TTX_NOT_OPEN, "Base TTransport cannot read.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Base TTransport cannot read.");
}
/**
@@ -110,7 +110,7 @@
* @throws TTransportException if an error occurs
*/
virtual void write(const uint8_t* buf, uint32_t len) {
- throw TTransportException(TTX_NOT_OPEN, "Base TTransport cannot write.");
+ throw TTransportException(TTransportException::NOT_OPEN, "Base TTransport cannot write.");
}
/**
diff --git a/lib/cpp/src/transport/TTransportException.h b/lib/cpp/src/transport/TTransportException.h
index 6dbfb13..3ab1d66 100644
--- a/lib/cpp/src/transport/TTransportException.h
+++ b/lib/cpp/src/transport/TTransportException.h
@@ -7,16 +7,6 @@
namespace facebook { namespace thrift { namespace transport {
/**
- * Error codes for the various types of exceptions.
- */
-enum TTransportExceptionType {
- TTX_UNKNOWN = 0,
- TTX_NOT_OPEN = 1,
- TTX_TIMED_OUT = 2,
- TTX_EOF = 3,
-};
-
-/**
* Class to encapsulate all the possible types of transport errors that may
* occur in various transport systems. This provides a sort of generic
* wrapper around the shitty UNIX E_ error codes that lets a common code
@@ -27,9 +17,19 @@
*/
class TTransportException : public facebook::thrift::TException {
public:
+ /**
+ * Error codes for the various types of exceptions.
+ */
+ enum TTransportExceptionType {
+ UNKNOWN = 0,
+ NOT_OPEN = 1,
+ TIMED_OUT = 2,
+ END_OF_FILE = 3,
+ };
+
TTransportException() :
facebook::thrift::TException(),
- type_(TTX_UNKNOWN) {}
+ type_(UNKNOWN) {}
TTransportException(TTransportExceptionType type) :
facebook::thrift::TException(),
@@ -37,7 +37,7 @@
TTransportException(const std::string message) :
facebook::thrift::TException(message),
- type_(TTX_UNKNOWN) {}
+ type_(UNKNOWN) {}
TTransportException(TTransportExceptionType type, const std::string message) :
facebook::thrift::TException(message),