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

Merge branch 'master' into master

Browse Source
This commit is contained in:
mergify[bot] 2022-04-11 08:14:21 +00:00 committed by GitHub
commit 15c523c969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Storages/WindowView/StorageWindowView.cpp
View File

@ -915,26 +915,38 @@ void StorageWindowView::threadFuncCleanup()
void StorageWindowView::threadFuncFireProc()
{
static bool window_kind_larger_than_day = window_kind == IntervalKind::Week || window_kind == IntervalKind::Month
|| window_kind == IntervalKind::Quarter || window_kind == IntervalKind::Year;
std::unique_lock lock(fire_signal_mutex);
UInt32 timestamp_now = std::time(nullptr);
while (next_fire_signal <= timestamp_now)
/// When window kind is larger than day, getWindowUpperBound() will get a day num instead of timestamp,
/// and addTime will also add day num to the next_fire_signal, so we need to convert it into timestamp.
/// Otherwise, we will get wrong result and after create window view with window kind larger than day,
/// since day num is too smaller than current timestamp, it will fire a lot.
auto exact_fire_signal = window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal;
while (exact_fire_signal <= timestamp_now)
{
try
{
fire(next_fire_signal);
fire(exact_fire_signal);
}
catch (...)
{
tryLogCurrentException(__PRETTY_FUNCTION__);
}
max_fired_watermark = next_fire_signal;
max_fired_watermark = exact_fire_signal;
next_fire_signal = addTime(next_fire_signal, window_kind, window_num_units, *time_zone);
exact_fire_signal = window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal;
}
UInt64 timestamp_ms = static_cast<UInt64>(Poco::Timestamp().epochMicroseconds()) / 1000;
if (!shutdown_called)
fire_task->scheduleAfter(std::max(UInt64(0), static_cast<UInt64>(next_fire_signal) * 1000 - timestamp_ms));
fire_task->scheduleAfter(std::max(
UInt64(0),
static_cast<UInt64>(window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal) * 1000 - timestamp_ms));
}
void StorageWindowView::threadFuncFireEvent()