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

Fixed TSan report in StorageSystemTables

Browse Source
This commit is contained in:
Alexey Milovidov 2019-03-28 22:13:59 +03:00
parent 8f9c8defc5
commit 4645422176
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Storages/System/StorageSystemTables.cpp
View File

@ -174,9 +174,8 @@ protected:
for (; rows_count < max_block_size && tables_it->isValid(); tables_it->next())
{
auto table_name = tables_it->name();
const auto table = context.tryGetTable(database_name, table_name);
if (!table)
continue;
const StoragePtr & table = tables_it->table();
auto lock = table->lockStructureForShare(false, context.getCurrentQueryId());
++rows_count;
@ -190,13 +189,13 @@ protected:
res_columns[res_index++]->insert(table_name);
if (columns_mask[src_index++])
res_columns[res_index++]->insert(tables_it->table()->getName());
res_columns[res_index++]->insert(table->getName());
if (columns_mask[src_index++])
res_columns[res_index++]->insert(0u); // is_temporary
if (columns_mask[src_index++])
res_columns[res_index++]->insert(tables_it->table()->getDataPath());
res_columns[res_index++]->insert(table->getDataPath());
if (columns_mask[src_index++])
res_columns[res_index++]->insert(database->getTableMetadataPath(table_name));