arangodb · mchacki · Aug 18, 2021 · Jun 11, 2021 · Jun 11, 2021 · Jun 11, 2021
diff --git a/arangod/Aql/DistributeExecutor.cpp b/arangod/Aql/DistributeExecutor.cpp
@@ -137,7 +137,9 @@ auto DistributeExecutor::getClient(SharedAqlItemBlockPtr const& block, size_t ro
     THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "DistributeExecutor requires an object as input");
   }
   auto res = _infos.getResponsibleClient(input);
-  THROW_ARANGO_EXCEPTION_IF_FAIL(res.result());
+  if (res.fail()) {
+    THROW_ARANGO_EXCEPTION(std::move(res).result());
+  }
   return res.get();
 }
 

diff --git a/arangod/Graph/Graph.cpp b/arangod/Graph/Graph.cpp
@@ -199,7 +199,10 @@ void Graph::insertOrphanCollections(VPackSlice const arr) {
         "'orphanCollections' are not an array in the graph definition");
   }
   for (auto const& c : VPackArrayIterator(arr)) {
-    THROW_ARANGO_EXCEPTION_IF_FAIL(validateOrphanCollection(c));
+    auto res = validateOrphanCollection(c);
+    if (res.fail()) {
+      THROW_ARANGO_EXCEPTION(std::move(res));
+    }
     addOrphanCollection(c.copyString());
   }
 }

diff --git a/arangod/Replication2/ReplicatedLog/Algorithms.cpp b/arangod/Replication2/ReplicatedLog/Algorithms.cpp
@@ -131,11 +131,12 @@ auto algorithms::checkReplicatedLog(DatabaseID const& database,
         auto const numParticipants = newLeaderSet.size();
         if (ADB_UNLIKELY(numParticipants == 0 ||
                          numParticipants > std::numeric_limits<uint16_t>::max())) {
-          ASSERT_OR_THROW_ARANGO_EXCEPTION_MESSAGE(
+          abortOrThrow(
               TRI_ERROR_NUMERIC_OVERFLOW,
               basics::StringUtils::concatT(
                   "Number of participants out of range, should be between ", 1,
-                  " and ", std::numeric_limits<uint16_t>::max(), ", but is ", numParticipants));
+                  " and ", std::numeric_limits<uint16_t>::max(), ", but is ", numParticipants),
+              ADB_HERE);
         }
         auto const maxIdx = static_cast<uint16_t>(numParticipants - 1);
         // Randomly select one of the best participants

diff --git a/arangod/Replication2/ReplicatedLog/InMemoryLog.cpp b/arangod/Replication2/ReplicatedLog/InMemoryLog.cpp
@@ -233,7 +233,7 @@ void replicated_log::InMemoryLog::appendInPlace(LoggerContext const& logContext,
         "mismatching log index. Last log index is ",
         getLastIndex(), ", but the new entry has ", entry.entry().logIndex());
     LOG_CTX("e2775", ERR, logContext) << message;
-    ASSERT_OR_THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, std::move(message));
+    basics::abortOrThrow(TRI_ERROR_INTERNAL, std::move(message), ADB_HERE);
   }
   _log = _log.push_back(std::move(entry));
 }

diff --git a/arangod/Replication2/ReplicatedLog/LogFollower.cpp b/arangod/Replication2/ReplicatedLog/LogFollower.cpp
@@ -275,7 +275,7 @@ auto replicated_log::LogFollower::resign() && -> std::tuple<std::unique_ptr<LogC
     if (followerData._logCore == nullptr) {
       LOG_CTX("55a1d", WARN, _loggerContext)
           << "follower log core is already gone. Resign was called twice!";
-      ASSERT_OR_THROW_ARANGO_EXCEPTION(TRI_ERROR_REPLICATION_REPLICATED_LOG_FOLLOWER_RESIGNED);
+      basics::abortOrThrow(TRI_ERROR_REPLICATION_REPLICATED_LOG_FOLLOWER_RESIGNED, ADB_HERE);
     }
 
     // use a unique ptr because move constructor for multimaps is not noexcept

diff --git a/arangod/Replication2/Version.cpp b/arangod/Replication2/Version.cpp
@@ -64,8 +64,8 @@ auto replication::versionToString(replication::Version version) -> std::string_v
     case Version::TWO:
       return "2";
   }
-  ASSERT_OR_THROW_ARANGO_EXCEPTION_MESSAGE(
-      TRI_ERROR_INTERNAL,
-      StringUtils::concatT("Unhandled replication version: ",
-                           static_cast<std::underlying_type_t<Version>>(version)));
+  abortOrThrow(TRI_ERROR_INTERNAL,
+               StringUtils::concatT("Unhandled replication version: ",
+                                    static_cast<std::underlying_type_t<Version>>(version)),
+               ADB_HERE);
 }
diff --git a/arangosh/Export/ExportFeature.cpp b/arangosh/Export/ExportFeature.cpp
@@ -558,7 +558,10 @@ void ExportFeature::writeBatch(ManagedDirectory::File & fd, VPackArrayIterator i
 
 void ExportFeature::writeToFile(ManagedDirectory::File & fd, std::string const& line) {
   fd.write(line.c_str(), line.size());
-  THROW_ARANGO_EXCEPTION_IF_FAIL(fd.status());
+  auto res = fd.status();
+  if (res.fail()) {
+    THROW_ARANGO_EXCEPTION(std::move(res));
+  }
 }
 
 std::shared_ptr<VPackBuilder> ExportFeature::httpCall(SimpleHttpClient* httpClient,

diff --git a/lib/Basics/Exceptions.cpp b/lib/Basics/Exceptions.cpp
@@ -40,71 +40,55 @@
 using namespace arangodb;
 using namespace arangodb::basics;
 
-/// @brief constructor, without format string
-Exception::Exception(ErrorCode code, char const* file, int line)
-    : _errorMessage(TRI_errno_string(code)), _file(file), _line(line), _code(code) {
+// All other constructors delegate to this one.
+Exception::Exception(ErrorCode code, std::string&& errorMessage, SourceLocation location) noexcept
+    : _errorMessage(std::move(errorMessage)),
+      _location(location),
+      _code(code) {
   appendLocation();
 }
+Exception::Exception(ErrorCode code, SourceLocation location)
+    : Exception(code, TRI_errno_string(code), location) {}
+Exception::Exception(Result const& result, SourceLocation location)
+    : Exception(result.errorNumber(), result.errorMessage(), location) {}
+Exception::Exception(Result&& result, SourceLocation location) noexcept
+    : Exception(result.errorNumber(), std::move(result).errorMessage(), location) {}
+Exception::Exception(ErrorCode code, std::string_view errorMessage, SourceLocation location)
+    : Exception(code, std::string{errorMessage}, location) {}
+Exception::Exception(ErrorCode code, const char* errorMessage, SourceLocation location)
+    : Exception(code, std::string{errorMessage}, location) {}
 
+Exception::Exception(ErrorCode code, char const* file, int line)
+    : Exception(code, SourceLocation(file, line)) {}
 Exception::Exception(arangodb::Result const& result, char const* file, int line)
-    : _errorMessage(result.errorMessage()),
-      _file(file),
-      _line(line),
-      _code(result.errorNumber()) {
-  appendLocation();
-}
-
-Exception::Exception(arangodb::Result&& result, char const* file, int line)
-    : _errorMessage(std::move(result).errorMessage()),  // cast to rvalueref so the error
-                                                        // string gets moved out
-      _file(file),
-      _line(line),
-      _code(result.errorNumber()) {
-  appendLocation();
-}
-
-/// @brief constructor, for creating an exception with an already created
-/// error message (normally based on error templates containing %s, %d etc.)
+    : Exception(result, SourceLocation(file, line)) {}
+Exception::Exception(arangodb::Result&& result, char const* file, int line) noexcept
+    : Exception(std::move(result), SourceLocation(file, line)) {}
 Exception::Exception(ErrorCode code, std::string_view errorMessage, char const* file, int line)
-    : _errorMessage(errorMessage), _file(file), _line(line), _code(code) {
-  appendLocation();
-}
-
-/// @brief constructor, for creating an exception with an already created
-/// error message (normally based on error templates containing %s, %d etc.)
-Exception::Exception(ErrorCode code, std::string&& errorMessage, char const* file, int line)
-    : _errorMessage(std::move(errorMessage)), _file(file), _line(line), _code(code) {
-  appendLocation();
-}
-
-/// @brief constructor, for creating an exception with an already created
-/// error message (normally based on error templates containing %s, %d etc.)
+    : Exception(code, errorMessage, SourceLocation(file, line)) {}
+Exception::Exception(ErrorCode code, std::string&& errorMessage, char const* file, int line) noexcept
+    : Exception(code, std::move(errorMessage), SourceLocation(file, line)) {}
 Exception::Exception(ErrorCode code, char const* errorMessage, char const* file, int line)
-    : _errorMessage(errorMessage), _file(file), _line(line), _code(code) {
-  appendLocation();
-}
+    : Exception(code, errorMessage, SourceLocation(file, line)) {}
 
 /// @brief returns the error message
 std::string const& Exception::message() const noexcept { return _errorMessage; }
 
 /// @brief returns the error code
 ErrorCode Exception::code() const noexcept { return _code; }
 
-/// @brief adds to the message
-void Exception::addToMessage(std::string const& more) { _errorMessage += more; }
-
 /// @brief return exception message
 char const* Exception::what() const noexcept { return _errorMessage.c_str(); }
 
 /// @brief append original error location to message
 void Exception::appendLocation() noexcept try {
   if (_code == TRI_ERROR_INTERNAL) {
-    _errorMessage += std::string(" (exception location: ") + _file + ":" +
-                     std::to_string(_line) +
+    _errorMessage += std::string(" (exception location: ") + _location.file_name() +
+                     ":" + std::to_string(_location.line()) +
                      "). Please report this error to arangodb.com";
   } else if (_code == TRI_ERROR_OUT_OF_MEMORY || _code == TRI_ERROR_NOT_IMPLEMENTED) {
-    _errorMessage += std::string(" (exception location: ") + _file + ":" +
-                     std::to_string(_line) + ")";
+    _errorMessage += std::string(" (exception location: ") + _location.file_name() +
+                     ":" + std::to_string(_location.line()) + ")";
   }
 } catch (...) {
   // this function is called from the exception constructor, so it should
@@ -170,3 +154,9 @@ std::string Exception::FillFormatExceptionString(char const* format, ...) {
       << "Failed to create an error message, giving up. " << errorMessage;
   FATAL_ERROR_EXIT();
 }
+
+[[noreturn]] void ::arangodb::basics::helper::logAndAbort(const char* what) {
+  LOG_TOPIC("fa7a1", FATAL, ::arangodb::Logger::CRASH) << what;
+  TRI_ASSERT(false);
+  FATAL_ERROR_ABORT();
+}