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

review fixes

Browse Source
This commit is contained in:
bharatnc 2020-12-15 00:08:18 -08:00
parent 5365d556e3
commit 9cddd22a7a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Storages/System/StorageSystemDDLWorkerQueue.cpp
View File

@ -38,6 +38,9 @@ namespace ErrorCodes
extern const int BAD_ARGUMENTS;
}
namespace DB
{
std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
{
return std::vector<std::pair<String, Int8>>{
@ -48,8 +51,7 @@ std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
};
}
namespace DB
{
std::vector<std::pair<String, Int8>> getZooKeeperErrorEnumsAndValues()
{
return std::vector<std::pair<String, Int8>>{
@ -110,7 +112,6 @@ static bool extractPathImpl(const IAST & elem, String & res, const Context & con
for (const auto & child : function->arguments->children)
if (extractPathImpl(*child, res, context))
return true;
return false;
}
@ -144,7 +145,6 @@ static bool extractPathImpl(const IAST & elem, String & res, const Context & con
res = literal->value.safeGet<String>();
return true;
}
return false;
}
@ -156,7 +156,6 @@ static String extractPath(const ASTPtr & query, const Context & context)
const auto & select = query->as<ASTSelectQuery &>();
if (!select.where())
return "";
String res;
return extractPathImpl(*select.where(), res, context) ? res : "";
}
@ -179,7 +178,6 @@ void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const C
[query-0000000000, query-0000000001, query-0000000002, query-0000000003, query-0000000004]
*/
// if there is error querying the root path of the ddl directory throw exception and stop
zkutil::Strings queries;
Coordination::Error code = zookeeper->tryGetChildren(ddl_zookeeper_path, queries);
@ -275,9 +273,10 @@ void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const C
Coordination::GetResponse res;
if (!futures.empty())
res = futures[query_id].get();
res_columns[i++]->insert(res.data); // value
auto query_start_time = res.stat.mtime;
res_columns[i++]->insert(res.data); // value
res_columns[i++]->insert(UInt64(query_start_time / 1000)); // query_start_time
res_columns[i++]->insert(UInt64(query_finish_time / 1000)); // query_finish_time
res_columns[i++]->insert(UInt64(query_finish_time - query_start_time)); // query_duration_ms

2
src/Storages/System/StorageSystemDDLWorkerQueue.h
View File

@ -12,7 +12,7 @@ namespace DB
class Context;
/** System table "ddl_worker_queue" with list of queries that are currently in the DDL worker queue.
/** System table "distributed_ddl_queue" with list of queries that are currently in the DDL worker queue.
*/
class StorageSystemDDLWorkerQueue final : public ext::shared_ptr_helper<StorageSystemDDLWorkerQueue>,
public IStorageSystemOneBlock<StorageSystemDDLWorkerQueue>