thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop last_ prefix for ErrorCodes::ValuePair::error_time_ms

Browse Source
This commit is contained in:
Azat Khuzhin 2021-03-08 23:43:58 +03:00
parent 44c9dc753d
commit efdd04c958
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/ErrorCodes.cpp
View File

@ -598,7 +598,7 @@ namespace ErrorCodes
ValuePair inc_value{ ValuePair inc_value{
!remote, /* local */ !remote, /* local */
remote, /* remote */ remote, /* remote */
0, /* last_error_time_ms */ 0, /* error_time_ms */
message, /* message */ message, /* message */
stacktrace, /* stacktrace */ stacktrace, /* stacktrace */
}; };
@ -613,7 +613,7 @@ namespace ErrorCodes
stacktrace = value.stacktrace; stacktrace = value.stacktrace;
const auto now = std::chrono::system_clock::now(); const auto now = std::chrono::system_clock::now();
last_error_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count(); error_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
return *this; return *this;
} }

2
src/Common/ErrorCodes.h
View File

@ -28,7 +28,7 @@ namespace ErrorCodes
{ {
Value local = 0; Value local = 0;
Value remote = 0; Value remote = 0;
UInt64 last_error_time_ms = 0; UInt64 error_time_ms = 0;
std::string message; std::string message;
std::string stacktrace; std::string stacktrace;

8
src/Storages/System/StorageSystemErrors.cpp
View File

@ -24,7 +24,7 @@ NamesAndTypesList StorageSystemErrors::getNamesAndTypes()
void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
{ {
auto add_row = [&](std::string_view name, size_t code, size_t value, UInt64 last_error_time_ms, const std::string & message, const std::string & stacktrace, bool remote) auto add_row = [&](std::string_view name, size_t code, size_t value, UInt64 error_time_ms, const std::string & message, const std::string & stacktrace, bool remote)
{ {
if (value || context.getSettingsRef().system_events_show_zero_values) if (value || context.getSettingsRef().system_events_show_zero_values)
{ {
@ -32,7 +32,7 @@ void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context &
res_columns[col_num++]->insert(name); res_columns[col_num++]->insert(name);
res_columns[col_num++]->insert(code); res_columns[col_num++]->insert(code);
res_columns[col_num++]->insert(value); res_columns[col_num++]->insert(value);
res_columns[col_num++]->insert(last_error_time_ms / 1000); res_columns[col_num++]->insert(error_time_ms / 1000);
res_columns[col_num++]->insert(message); res_columns[col_num++]->insert(message);
res_columns[col_num++]->insert(stacktrace); res_columns[col_num++]->insert(stacktrace);
res_columns[col_num++]->insert(remote); res_columns[col_num++]->insert(remote);
@ -47,8 +47,8 @@ void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context &
if (name.empty()) if (name.empty())
continue; continue;
add_row(name, i, error.local, error.last_error_time_ms, error.message, error.stacktrace, 0 /* remote=0 */); add_row(name, i, error.local, error.error_time_ms, error.message, error.stacktrace, 0 /* remote=0 */);
add_row(name, i, error.remote, error.last_error_time_ms, error.message, error.stacktrace, 1 /* remote=1 */); add_row(name, i, error.remote, error.error_time_ms, error.message, error.stacktrace, 1 /* remote=1 */);
} }
} }