tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more information to the MG_ASSERT in release mode (#291)

Browse Source
This commit is contained in:
Kostas Kyrimis 2021-11-12 09:09:15 +01:00 committed by GitHub
parent 47c0c629c7
commit 95dd3481c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/csv_parsing.cpp
View File

@ -203,7 +203,7 @@ Reader::ParsingResult Reader::ParseRow(utils::MemoryResource *mem) {
// parse the header. // parse the header.
// Also, if we don't have a header, the 'number_of_columns_' will be 0, so no // Also, if we don't have a header, the 'number_of_columns_' will be 0, so no
// need to check the number of columns. // need to check the number of columns.
if (UNLIKELY(number_of_columns_ != 0 && row.size() != number_of_columns_)) { if (number_of_columns_ != 0 && row.size() != number_of_columns_) [[unlikely]] {
return ParseError(ParseError::ErrorCode::BAD_NUM_OF_COLUMNS, return ParseError(ParseError::ErrorCode::BAD_NUM_OF_COLUMNS,
// ToDo(the-joksim): // ToDo(the-joksim):
// - 'line_count_ - 1' is the last line of a row (as a // - 'line_count_ - 1' is the last line of a row (as a

22
src/utils/logging.hpp
View File

@ -26,10 +26,8 @@
#include <spdlog/sinks/stdout_color_sinks.h> #include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include "utils/likely.hpp"
namespace logging { namespace logging {
#ifndef NDEBUG
// TODO (antonio2368): Replace with std::source_location when it's supported by // TODO (antonio2368): Replace with std::source_location when it's supported by
// compilers // compilers
template <typename... Args> template <typename... Args>
@ -47,24 +45,12 @@ void AssertFailed(const char *file_name, int line_num, const char *expr, const A
std::terminate(); std::terminate();
} }
// TODO (antonio2368): Replace with attribute [[likely]] when it's supported by
// compilers
#define MG_ASSERT(expr, ...) \ #define MG_ASSERT(expr, ...) \
LIKELY(!!(expr)) \ [[likely]] !!(expr) ? (void)0 : ::logging::AssertFailed(__FILE__, __LINE__, #expr, ##__VA_ARGS__)
? (void)0 : ::logging::AssertFailed(__FILE__, __LINE__, #expr, ##__VA_ARGS__)
#ifndef NDEBUG
#define DMG_ASSERT(expr, ...) MG_ASSERT(expr, __VA_ARGS__) #define DMG_ASSERT(expr, ...) MG_ASSERT(expr, __VA_ARGS__)
#else #else
template <typename... Args>
void AssertFailed(const Args &...msg_args) {
if constexpr (sizeof...(msg_args) > 0) {
spdlog::critical("Assertion failed with message: '{}'", fmt::format(msg_args...).c_str());
} else {
spdlog::critical("Assertion failed");
}
std::terminate();
}
#define MG_ASSERT(expr, ...) LIKELY(!!(expr)) ? (void)0 : ::logging::AssertFailed(__VA_ARGS__)
#define DMG_ASSERT(...) #define DMG_ASSERT(...)
#endif #endif