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

Merge pull request #4313 from yandex/fix-error-in-system-tables

Browse Source 
Fixed error in system.tables
This commit is contained in:
alexey-milovidov 2019-02-08 19:32:43 +03:00 committed by GitHub
commit dca242f316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,8 +173,12 @@ protected:
for (; rows_count < max_block_size && tables_it->isValid(); tables_it->next()) for (; rows_count < max_block_size && tables_it->isValid(); tables_it->next())
{ {
++rows_count;
auto table_name = tables_it->name(); auto table_name = tables_it->name();
const auto table = context.tryGetTable(database_name, table_name);
if (!table)
continue;
++rows_count;
size_t src_index = 0; size_t src_index = 0;
size_t res_index = 0; size_t res_index = 0;
@ -253,11 +257,10 @@ protected:
else else
src_index += 2; src_index += 2;
const auto table_it = context.getTable(database_name, table_name);
ASTPtr expression_ptr; ASTPtr expression_ptr;
if (columns_mask[src_index++]) if (columns_mask[src_index++])
{ {
if ((expression_ptr = table_it->getPartitionKeyAST())) if ((expression_ptr = table->getPartitionKeyAST()))
res_columns[res_index++]->insert(queryToString(expression_ptr)); res_columns[res_index++]->insert(queryToString(expression_ptr));
else else
res_columns[res_index++]->insertDefault(); res_columns[res_index++]->insertDefault();
@ -265,7 +268,7 @@ protected:
if (columns_mask[src_index++]) if (columns_mask[src_index++])
{ {
if ((expression_ptr = table_it->getSortingKeyAST())) if ((expression_ptr = table->getSortingKeyAST()))
res_columns[res_index++]->insert(queryToString(expression_ptr)); res_columns[res_index++]->insert(queryToString(expression_ptr));
else else
res_columns[res_index++]->insertDefault(); res_columns[res_index++]->insertDefault();
@ -273,7 +276,7 @@ protected:
if (columns_mask[src_index++]) if (columns_mask[src_index++])
{ {
if ((expression_ptr = table_it->getPrimaryKeyAST())) if ((expression_ptr = table->getPrimaryKeyAST()))
res_columns[res_index++]->insert(queryToString(expression_ptr)); res_columns[res_index++]->insert(queryToString(expression_ptr));
else else
res_columns[res_index++]->insertDefault(); res_columns[res_index++]->insertDefault();
@ -281,7 +284,7 @@ protected:
if (columns_mask[src_index++]) if (columns_mask[src_index++])
{ {
if ((expression_ptr = table_it->getSamplingKeyAST())) if ((expression_ptr = table->getSamplingKeyAST()))
res_columns[res_index++]->insert(queryToString(expression_ptr)); res_columns[res_index++]->insert(queryToString(expression_ptr));
else else
res_columns[res_index++]->insertDefault(); res_columns[res_index++]->insertDefault();

0
dbms/tests/queries/0_stateless/00838_system_tables_drop_table_race.reference Normal file
View File

13
dbms/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh Executable file
View File

@ -0,0 +1,13 @@
#!/usr/bin/env bash
set -e
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. $CURDIR/../shell_config.sh
$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test.table"
seq 1 100 | sed -r -e "s/.+/CREATE TABLE test.table (x UInt8) ENGINE = MergeTree ORDER BY x; DROP TABLE test.table;/" | $CLICKHOUSE_CLIENT -n &
seq 1 100 | sed -r -e "s/.+/SELECT * FROM system.tables WHERE database = 'test' LIMIT 1000000, 1;/" | $CLICKHOUSE_CLIENT -n &
wait