implement conversion from error codes to different http statuses

dbms/src/Server/HTTPHandler.cpp

@@ -2,6 +2,7 @@
 
 #include <Poco/Net/HTTPBasicCredentials.h>
 
+#include <DB/Common/ExternalTable.h>
 #include <DB/Common/StringUtils.h>
 
 #include <DB/IO/ReadBufferFromIStream.h>
@@ -19,12 +20,8 @@
 #include <DB/Interpreters/executeQuery.h>
 #include <DB/Interpreters/Quota.h>
 
-#include <DB/Common/ExternalTable.h>
-
 #include "HTTPHandler.h"
 
-
-
 namespace DB
 {
 
@@ -33,11 +30,90 @@ namespace ErrorCodes
 	extern const int READONLY;
 	extern const int UNKNOWN_COMPRESSION_METHOD;
 
+	extern const int CANNOT_PARSE_TEXT;
+	extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
+	extern const int CANNOT_PARSE_QUOTED_STRING;
+	extern const int CANNOT_PARSE_DATE;
+	extern const int CANNOT_PARSE_DATETIME;
+	extern const int CANNOT_PARSE_NUMBER;
+
+	extern const int UNKNOWN_ELEMENT_IN_AST;
+	extern const int UNKNOWN_TYPE_OF_AST_NODE;
+	extern const int TOO_DEEP_AST;
+	extern const int TOO_BIG_AST;
+	extern const int UNEXPECTED_AST_STRUCTURE;
+
+	extern const int UNKNOWN_TABLE;
+	extern const int UNKNOWN_FUNCTION;
+	extern const int UNKNOWN_IDENTIFIER;
+	extern const int UNKNOWN_TYPE;
+	extern const int UNKNOWN_STORAGE;
+	extern const int UNKNOWN_DATABASE;
+	extern const int UNKNOWN_SETTING;
+	extern const int UNKNOWN_DIRECTION_OF_SORTING;
+	extern const int UNKNOWN_AGGREGATE_FUNCTION;
+	extern const int UNKNOWN_FORMAT;
+	extern const int UNKNOWN_DATABASE_ENGINE;
+	extern const int UNKNOWN_TYPE_OF_QUERY;
+
+	extern const int QUERY_IS_TOO_LARGE;
+
+	extern const int NOT_IMPLEMENTED;
+	extern const int SOCKET_TIMEOUT;
+
 	extern const int UNKNOWN_USER;
 	extern const int WRONG_PASSWORD;
 	extern const int REQUIRED_PASSWORD;
 }
 
+static Poco::Net::HTTPResponse::HTTPStatus exceptionCodeToHttpStatus(int exception_code)
+{
+	using namespace Poco::Net;
+
+	if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
+		return HTTPResponse::HTTP_UNAUTHORIZED;
+	else if (exception_code == ErrorCodes::CANNOT_PARSE_TEXT ||
+			 exception_code == ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE ||
+			 exception_code == ErrorCodes::CANNOT_PARSE_QUOTED_STRING ||
+			 exception_code == ErrorCodes::CANNOT_PARSE_DATE ||
+			 exception_code == ErrorCodes::CANNOT_PARSE_DATETIME ||
+			 exception_code == ErrorCodes::CANNOT_PARSE_NUMBER)
+		return HTTPResponse::HTTP_BAD_REQUEST;
+	else if (exception_code == ErrorCodes::UNKNOWN_ELEMENT_IN_AST ||
+			 exception_code == ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE ||
+			 exception_code == ErrorCodes::TOO_DEEP_AST ||
+			 exception_code == ErrorCodes::TOO_BIG_AST ||
+			 exception_code == ErrorCodes::UNEXPECTED_AST_STRUCTURE)
+		return HTTPResponse::HTTP_BAD_REQUEST;
+	else if (exception_code == ErrorCodes::UNKNOWN_TABLE ||
+			 exception_code == ErrorCodes::UNKNOWN_FUNCTION ||
+			 exception_code == ErrorCodes::UNKNOWN_IDENTIFIER ||
+			 exception_code == ErrorCodes::UNKNOWN_TYPE ||
+			 exception_code == ErrorCodes::UNKNOWN_STORAGE ||
+			 exception_code == ErrorCodes::UNKNOWN_DATABASE ||
+			 exception_code == ErrorCodes::UNKNOWN_SETTING ||
+			 exception_code == ErrorCodes::UNKNOWN_DIRECTION_OF_SORTING ||
+			 exception_code == ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION ||
+			 exception_code == ErrorCodes::UNKNOWN_FORMAT ||
+			 exception_code == ErrorCodes::UNKNOWN_DATABASE_ENGINE)
+		return HTTPResponse::HTTP_NOT_FOUND;
+	else if (exception_code == ErrorCodes::UNKNOWN_TYPE_OF_QUERY)
+		return HTTPResponse::HTTP_NOT_FOUND;
+	else if (exception_code == ErrorCodes::QUERY_IS_TOO_LARGE)
+		return HTTPResponse::HTTP_REQUESTENTITYTOOLARGE;
+	else if (exception_code == ErrorCodes::NOT_IMPLEMENTED)
+		return HTTPResponse::HTTP_NOT_IMPLEMENTED;
+	else if (exception_code == ErrorCodes::SOCKET_TIMEOUT)
+		return HTTPResponse::HTTP_SERVICE_UNAVAILABLE;
+
+	return HTTPResponse::HTTP_INTERNAL_SERVER_ERROR;
+}
+
+HTTPHandler::HTTPHandler(Server & server_)
+	: server(server_)
+	, log(&Logger::get("HTTPHandler"))
+{
+}
 
 void HTTPHandler::processQuery(
 	Poco::Net::HTTPServerRequest & request,
@@ -275,7 +351,6 @@ void HTTPHandler::processQuery(
 	used_output.out->finalize();
 }
 
-
 void HTTPHandler::trySendExceptionToClient(const std::string & s, int exception_code,
 	Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response,
 	Output & used_output)
@@ -291,8 +366,9 @@ void HTTPHandler::trySendExceptionToClient(const std::string & s, int exception_
 			request.stream().ignore(std::numeric_limits<std::streamsize>::max());
 		}
 
-		bool auth_fail = exception_code == ErrorCodes::UNKNOWN_USER || exception_code == ErrorCodes::WRONG_PASSWORD
-						 || exception_code == ErrorCodes::REQUIRED_PASSWORD;
+		bool auth_fail = exception_code == ErrorCodes::UNKNOWN_USER ||
+						 exception_code == ErrorCodes::WRONG_PASSWORD ||
+						 exception_code == ErrorCodes::REQUIRED_PASSWORD;
 
 		if (auth_fail)
 		{
@@ -300,7 +376,7 @@ void HTTPHandler::trySendExceptionToClient(const std::string & s, int exception_
 		}
 		else
 		{
-			response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+			response.setStatusAndReason(exceptionCodeToHttpStatus(exception_code));
 		}
 
 		if (!response.sent() && !used_output.out_maybe_compressed)
@@ -351,7 +427,6 @@ static int getCurrentExceptionCode()
 	return 0;
 }
 
-
 void HTTPHandler::handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response)
 {
 	Output used_output;

dbms/src/Server/HTTPHandler.h

@@ -17,12 +17,11 @@ class WriteBufferFromHTTPServerResponse;
 class HTTPHandler : public Poco::Net::HTTPRequestHandler
 {
 public:
-	HTTPHandler(Server & server_)
-		: server(server_)
-		, log(&Logger::get("HTTPHandler"))
-	{
-	}
+	explicit HTTPHandler(Server & server_);
+
+	void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response) override;
 
+private:
 	struct Output
 	{
 		std::shared_ptr<WriteBufferFromHTTPServerResponse> out;
@@ -30,13 +29,6 @@ public:
 		std::shared_ptr<WriteBuffer> out_maybe_compressed;
 	};
 
-	void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response) override;
-
-	void trySendExceptionToClient(const std::string & s, int exception_code,
-		Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response,
-		Output & used_output);
-
-private:
 	Server & server;
 
 	CurrentMetrics::Increment metric_increment{CurrentMetrics::HTTPConnection};
@@ -49,6 +41,10 @@ private:
 		HTMLForm & params,
 		Poco::Net::HTTPServerResponse & response,
 		Output & used_output);
+
+	void trySendExceptionToClient(const std::string & s, int exception_code,
+		Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response,
+		Output & used_output);
 };
 
 }