thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 14:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixing bug in StorageLiveView.cpp getHeader() method

Browse Source 
that sometimes addressed invalid pointer when getHeader()
  method was called without holding the mutex
This commit is contained in:
Vitaliy Zakaznikov 2019-06-14 16:27:43 -04:00
parent 13978c03f3
commit d6d0404c48
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/src/Storages/StorageLiveView.cpp
View File

@ -158,11 +158,10 @@ bool StorageLiveView::hasColumn(const String & column_name) const
Block StorageLiveView::getHeader() const Block StorageLiveView::getHeader() const
{ {
if (!sample_block) if (!sample_block)
{
if (!(*blocks_ptr) || (*blocks_ptr)->empty())
{ {
auto storage = global_context.getTable(select_database_name, select_table_name); auto storage = global_context.getTable(select_database_name, select_table_name);
sample_block = InterpreterSelectQuery(inner_query, global_context, storage, SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock(); sample_block = InterpreterSelectQuery(inner_query, global_context, storage,
SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock();
sample_block.insert({DataTypeUInt64().createColumnConst( sample_block.insert({DataTypeUInt64().createColumnConst(
sample_block.rows(), 0)->convertToFullColumnIfConst(), sample_block.rows(), 0)->convertToFullColumnIfConst(),
std::make_shared<DataTypeUInt64>(), std::make_shared<DataTypeUInt64>(),
@ -174,11 +173,6 @@ Block StorageLiveView::getHeader() const
sample_block.safeGetByPosition(i).column = sample_block.safeGetByPosition(i).column->convertToFullColumnIfConst(); sample_block.safeGetByPosition(i).column = sample_block.safeGetByPosition(i).column->convertToFullColumnIfConst();
} }
} }
else
{
sample_block = (*blocks_ptr)->front().cloneEmpty();
}
}
return sample_block; return sample_block;
} }