thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-15 10:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

use max_fired_watermark to cleanup cache in proc time

Browse Source
This commit is contained in:
Vxider 2020-03-31 14:28:04 +08:00
parent 8f84599ba3
commit 36383d83f1
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/src/Storages/WindowView/StorageWindowView.cpp
View File

@ -341,19 +341,16 @@ Pipes StorageWindowView::blocksToPipes(BlocksList & blocks, Block & sample_block
inline void StorageWindowView::cleanCache() inline void StorageWindowView::cleanCache()
{ {
UInt32 w_bound; UInt32 w_bound;
if (is_proctime)
{
w_bound = getWindowUpperBound(std::time(nullptr));
}
else
{ {
std::lock_guard lock(fire_signal_mutex); std::lock_guard lock(fire_signal_mutex);
if (max_watermark == 0)
return;
w_bound = max_fired_watermark; w_bound = max_fired_watermark;
if (w_bound == 0) if (w_bound == 0)
return; return;
if (!is_proctime)
{
if (max_watermark == 0)
return;
if (allowed_lateness) if (allowed_lateness)
{ {
UInt32 lateness_bound = addTime(max_timestamp, lateness_kind, -1 * lateness_num_units, time_zone); UInt32 lateness_bound = addTime(max_timestamp, lateness_kind, -1 * lateness_num_units, time_zone);
@ -362,9 +359,7 @@ inline void StorageWindowView::cleanCache()
w_bound = lateness_bound; w_bound = lateness_bound;
} }
} }
}
w_bound = is_tumble ? addTime(w_bound, window_kind, -1 * window_num_units, time_zone)
: addTime(w_bound, hop_kind, -1 * hop_num_units, time_zone);
auto sql = generateCleanCacheQuery(w_bound); auto sql = generateCleanCacheQuery(w_bound);
InterpreterAlterQuery alt_query(sql, global_context); InterpreterAlterQuery alt_query(sql, global_context);
@ -694,6 +689,7 @@ void StorageWindowView::threadFuncFireProc()
while (next_fire_signal <= timestamp_now) while (next_fire_signal <= timestamp_now)
{ {
fire(next_fire_signal); fire(next_fire_signal);
max_fired_watermark = next_fire_signal;
next_fire_signal = addTime(next_fire_signal, window_kind, window_num_units, time_zone); next_fire_signal = addTime(next_fire_signal, window_kind, window_num_units, time_zone);
} }