Merge branch 'devel' of github.com:arangodb/arangodb into feature/err…

…or-messages-as-string-views
arangodb · jsteemann · Feb 11, 2021 · Jan 21, 2021 · Jan 21, 2021 · Jan 21, 2021
commit 4dfcda5e7101db45c5ad8d98bfbbca61701c4626
diff --git a/arangod/Aql/Parser.cpp b/arangod/Aql/Parser.cpp
@@ -132,7 +132,7 @@ QueryResult Parser::parseWithDetails() {
 }
 
 /// @brief register a parse error, position is specified as line / column
-void Parser::registerParseError(int errorCode, char const* format,
+void Parser::registerParseError(ErrorCode errorCode, char const* format,
                                 std::string_view data, int line, int column) {
   char buffer[512];
   // make sure the buffer is always initialized
@@ -145,7 +145,7 @@ void Parser::registerParseError(int errorCode, char const* format,
 }
 
 /// @brief register a parse error, position is specified as line / column
-void Parser::registerParseError(int errorCode, std::string_view data, int line, int column) {
+void Parser::registerParseError(ErrorCode errorCode, std::string_view data, int line, int column) {
   TRI_ASSERT(errorCode != TRI_ERROR_NO_ERROR);
   TRI_ASSERT(data.data() != nullptr);
 
@@ -176,7 +176,7 @@ void Parser::registerParseError(int errorCode, std::string_view data, int line,
 }
 
 /// @brief register a warning
-void Parser::registerWarning(int errorCode, std::string_view data,
+void Parser::registerWarning(ErrorCode errorCode, std::string_view data,
                              [[maybe_unused]] int line, [[maybe_unused]] int column) {
   // ignore line and column for now
   _query.warnings().registerWarning(errorCode, data);

diff --git a/arangod/Aql/Parser.h b/arangod/Aql/Parser.h
@@ -102,13 +102,14 @@ class Parser {
   QueryResult parseWithDetails();
 
   /// @brief register a parse error, position is specified as line / column
-  void registerParseError(int, char const*, std::string_view, int, int);
+  void registerParseError(ErrorCode errorCode, char const* format,
+                          std::string_view data, int line, int column);
 
   /// @brief register a parse error, position is specified as line / column
-  void registerParseError(int, std::string_view, int, int);
-  
+  void registerParseError(ErrorCode errorCode, std::string_view data, int line, int column);
+
   /// @brief register a warning
-  void registerWarning(int, std::string_view, int, int);
+  void registerWarning(ErrorCode errorCode, std::string_view data, int line, int column);
 
   /// @brief push an AstNode array element on top of the stack
   /// the array must be removed from the stack via popArray

diff --git a/arangod/Aql/QueryWarnings.cpp b/arangod/Aql/QueryWarnings.cpp
@@ -39,7 +39,7 @@ QueryWarnings::QueryWarnings()
 
 /// @brief register an error
 /// this also makes the query abort
-void QueryWarnings::registerError(int code, std::string_view details) {
+void QueryWarnings::registerError(ErrorCode code, std::string_view details) {
   TRI_ASSERT(code != TRI_ERROR_NO_ERROR);
 
   if (details.data() == nullptr) {
@@ -50,7 +50,7 @@ void QueryWarnings::registerError(int code, std::string_view details) {
 }
 
 /// @brief register a warning
-void QueryWarnings::registerWarning(int code, std::string_view details) {
+void QueryWarnings::registerWarning(ErrorCode code, std::string_view details) {
   TRI_ASSERT(code != TRI_ERROR_NO_ERROR);
 
   std::lock_guard<std::mutex> guard(_mutex);

diff --git a/arangod/Aql/QueryWarnings.h b/arangod/Aql/QueryWarnings.h
@@ -49,10 +49,9 @@ class QueryWarnings final {
 
   /// @brief register an error
   /// this also makes the query abort
-  [[noreturn]] void registerError(int, std::string_view = {});
-
+  [[noreturn]] void registerError(ErrorCode code, std::string_view details = nullptr);
   /// @brief register a warning
-  void registerWarning(int code, std::string_view details = {});
+  void registerWarning(ErrorCode code, std::string_view details = nullptr);
 
   void toVelocyPack(arangodb::velocypack::Builder& b) const;
 

diff --git a/arangod/GeneralServer/CommTask.cpp b/arangod/GeneralServer/CommTask.cpp
@@ -452,7 +452,7 @@ void CommTask::sendSimpleResponse(rest::ResponseCode code,
 
 /// @brief send response including error response body
 void CommTask::sendErrorResponse(rest::ResponseCode code, rest::ContentType respType,
-                                 uint64_t messageId, int errorNum,
+                                 uint64_t messageId, ErrorCode errorNum,
                                  std::string_view errorMessage /* = {} */) {
   VPackBuffer<uint8_t> buffer;
   VPackBuilder builder(buffer);

diff --git a/arangod/GeneralServer/CommTask.h b/arangod/GeneralServer/CommTask.h
@@ -121,9 +121,9 @@ class CommTask : public std::enable_shared_from_this<CommTask> {
 
   /// @brief send response including error response body
   void sendErrorResponse(rest::ResponseCode, rest::ContentType,
-                         uint64_t messageId, int errorNum,
+                         uint64_t messageId, ErrorCode errorNum,
                          std::string_view errorMessage = {});
-  
+
   /// @brief send simple response including response body
   void sendSimpleResponse(rest::ResponseCode, rest::ContentType, uint64_t messageId,
                           velocypack::Buffer<uint8_t>&&);

diff --git a/arangod/GeneralServer/RestHandler.cpp b/arangod/GeneralServer/RestHandler.cpp
@@ -563,7 +563,7 @@ void RestHandler::compressResponse() {
 /// @brief generates an error
 ////////////////////////////////////////////////////////////////////////////////
 
-void RestHandler::generateError(rest::ResponseCode code, int errorNumber) {
+void RestHandler::generateError(rest::ResponseCode code, ErrorCode errorNumber) {
   auto const message = TRI_errno_string(errorNumber);
 
   if (message.data() != nullptr) {

diff --git a/lib/Basics/Exceptions.cpp b/lib/Basics/Exceptions.cpp
@@ -109,7 +109,7 @@ void Exception::appendLocation() noexcept try {
 }
 
 /// @brief construct an error message from a template string
-std::string Exception::FillExceptionString(int code, ...) {
+std::string Exception::FillExceptionString(ErrorCode code, ...) {
   // Note that we rely upon the string being null-terminated.
   // The string_view doesn't guarantee that, but we know that all error messages
   // are null-terminated.

diff --git a/lib/Basics/error.cpp b/lib/Basics/error.cpp
@@ -46,7 +46,7 @@ ErrorCode TRI_errno() { return LastError._number; }
 
 /// @brief returns the last error as string
 std::string_view TRI_last_error() {
-  int err = LastError._number;
+  ErrorCode err = LastError._number;
 
   if (err == TRI_ERROR_SYS_ERROR) {
     return strerror(LastError._sys);
@@ -81,8 +81,8 @@ void TRI_set_errno_string(ErrorCode code, char const* msg) {
 }
 
 /// @brief return an error message for an error code
-std::string_view TRI_errno_string(int code) noexcept {
-  auto it = ErrorMessages.find(code);
+std::string_view TRI_errno_string(ErrorCode code) noexcept {
+  auto it = ErrorMessages.find(code.asInt());
 
   if (it == ErrorMessages.end()) {
     // return a hard-coded string as not all callers check for nullptr

diff --git a/lib/Basics/error.h b/lib/Basics/error.h
@@ -26,6 +26,8 @@
 
 #include <string_view>
 
+#include "Basics/ErrorCode.h"
+
 /// @brief returns the last error
 ErrorCode TRI_errno();
 
@@ -39,7 +41,11 @@ ErrorCode TRI_set_errno(ErrorCode);
 void TRI_set_errno_string(ErrorCode code, char const* msg);
 
 /// @brief return an error message for an error code
+<<<<<<< HEAD
 std::string_view TRI_errno_string(int code) noexcept;
+=======
+char const* TRI_errno_string(ErrorCode code) noexcept;
+>>>>>>> 2fcec28799eec22959cd24855b891bb929539f39
 
 /// @brief initializes the error messages
 void TRI_InitializeError();