thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix check-style

Browse Source
This commit is contained in:
Mariia Khristenko 2024-05-13 18:14:25 +03:00
parent 6aa2190ebb
commit 692d4fd75d
4 changed files with 655 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1268
src/Common/ProfileEvents.cpp
View File

File diff suppressed because it is too large Load Diff

14
src/Common/ProfileEvents.h
View File

@ -148,13 +148,13 @@ namespace ProfileEvents
static const Event num_counters;
};
enum class ValueType : UInt64
enum class ValueType : uint8_t
{
NUMBER,
BYTES,
MILLISECONDS,
MICROSECONDS,
NANOSECONDS,
Number,
Bytes,
Milliseconds,
Microseconds,
Nanoseconds,
};
/// Increment a counter for event. Thread-safe.
@ -173,7 +173,7 @@ namespace ProfileEvents
/// Get description of event by identifier. Returns statically allocated string.
const char * getDocumentation(Event event);
/// Get value type of event by identifier. Returns statically allocated enum value.
/// Get value type of event by identifier. Returns enum value.
ValueType getValueType(Event event);
/// Get index just after last event identifier.

30
src/Common/ProgressTable.cpp
View File

@ -33,15 +33,15 @@ std::string formatReadableValue(ProfileEvents::ValueType value_type, double valu
{
switch (value_type)
{
case ProfileEvents::ValueType::NUMBER:
case ProfileEvents::ValueType::Number:
return formatReadableQuantity(value);
case ProfileEvents::ValueType::BYTES:
case ProfileEvents::ValueType::Bytes:
return formatReadableSizeWithDecimalSuffix(value);
case ProfileEvents::ValueType::NANOSECONDS:
case ProfileEvents::ValueType::Nanoseconds:
return formatReadableTime(value);
case ProfileEvents::ValueType::MICROSECONDS:
case ProfileEvents::ValueType::Microseconds:
return formatReadableTime(value * 1e3);
case ProfileEvents::ValueType::MILLISECONDS:
case ProfileEvents::ValueType::Milliseconds:
return formatReadableTime(value * 1e6);
}
}
@ -55,14 +55,14 @@ auto createEventToValueTypeMap()
ProfileEvents::ValueType value_type = getValueType(event);
event_to_value_type[name] = value_type;
}
event_to_value_type[MemoryTracker::USAGE_EVENT_NAME] = ProfileEvents::ValueType::BYTES;
event_to_value_type[MemoryTracker::USAGE_EVENT_NAME] = ProfileEvents::ValueType::Bytes;
return event_to_value_type;
}
std::string_view setColorForProgress(double progress, double max_progress)
{
static const std::string_view colors[] = {
"",
"\033[38;5;65m", /// Pale green
"\033[38;5;34m", /// Green
"\033[38;5;154m", /// Yellow-green
"\033[38;5;220m", /// Yellow
@ -256,9 +256,9 @@ void ProgressTable::MetricInfo::updateValue(Int64 new_value, double new_time)
{
/// If the value has not been updated for a long time
/// reset the time in snapshots.
if (new_time - new_snapshot.time >= 0.5 || new_snapshot.time == 0)
if (new_time - new_snapshot.time >= 0.25 || new_snapshot.time == 0)
{
prev_shapshot = {new_snapshot.value, new_time - 2.0};
prev_shapshot = {new_snapshot.value, new_time - 1.0};
cur_shapshot = {new_snapshot.value, new_time - 1.0};
}
@ -273,23 +273,17 @@ void ProgressTable::MetricInfo::updateValue(Int64 new_value, double new_time)
}
new_snapshot.time = new_time;
if (new_snapshot.time - cur_shapshot.time >= 0.5)
if (new_snapshot.time - cur_shapshot.time >= 0.25)
prev_shapshot = std::exchange(cur_shapshot, new_snapshot);
}
double ProgressTable::MetricInfo::calculateProgress(double time_now) const
{
/// If the value has not been updated for a long time, the progress is 0.
if (time_now - new_snapshot.time >= 0.5)
if (time_now - new_snapshot.time >= 0.25)
return 0;
switch (type)
{
case ProfileEvents::Type::INCREMENT:
return (cur_shapshot.value - prev_shapshot.value) / (cur_shapshot.time - prev_shapshot.time);
case ProfileEvents::Type::GAUGE:
return cur_shapshot.value - prev_shapshot.value;
}
return (cur_shapshot.value - prev_shapshot.value) / (cur_shapshot.time - prev_shapshot.time);
}
double ProgressTable::MetricInfo::getValue() const

2
utils/check-style/check-style
View File

@ -67,6 +67,7 @@ EXTERN_TYPES_EXCLUDES=(
ProfileEvents::getName
ProfileEvents::Type
ProfileEvents::TypeEnum
ProfileEvents::ValueType
ProfileEvents::dumpToMapColumn
ProfileEvents::getProfileEvents
ProfileEvents::ThreadIdToCountersSnapshot
@ -294,6 +295,7 @@ std_cerr_cout_excludes=(
base/base/iostream_debug_helpers.h
# OK
src/Common/ProgressIndication.cpp
src/Common/ProgressTable.cpp
# only under #ifdef DBMS_HASH_MAP_DEBUG_RESIZES, that is used only in tests
src/Common/HashTable/HashTable.h
# SensitiveDataMasker::printStats()