Fixed errors after merge [#CLICKHOUSE-2].

This commit is contained in:
Alexey Milovidov 2017-08-13 12:27:38 +03:00
parent 1cc50263d8
commit 547516c636
2 changed files with 2 additions and 2 deletions

View File

@ -728,7 +728,7 @@ void DDLWorker::cleanupQueue()
continue;
/// Delete node if its lifetmie is expired (according to task_max_lifetime parameter)
size_t zookeeper_time_seconds = stat.ctime / zookeeper_time_resolution;
Int64 zookeeper_time_seconds = stat.ctime / zookeeper_time_resolution;
bool node_lifetime_is_expired = zookeeper_time_seconds + task_max_lifetime < current_time_seconds;
/// If too many nodes in task queue (> max_tasks_in_queue), delete oldest one

View File

@ -97,7 +97,7 @@ private:
size_t max_tasks_in_queue = 1000;
friend class DDLQueryStatusInputSream;
friend class DDLTask;
friend struct DDLTask;
};