thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36967 from Vxider/wv-fix-stuck

Browse Source 
Fix stuck when drop source table in WindowView
This commit is contained in:
Kseniia Sumarokova 2022-05-08 12:00:10 +02:00 committed by GitHub
commit b201d6d684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/WindowView/StorageWindowView.cpp
View File

@ -1085,8 +1085,7 @@ StorageWindowView::StorageWindowView(
InterpreterCreateQuery create_interpreter(inner_create_query, create_context);
create_interpreter.setInternal(true);
create_interpreter.execute();
inner_storage = DatabaseCatalog::instance().getTable(StorageID(inner_create_query->getDatabase(), inner_create_query->getTable()), getContext());
inner_table_id = inner_storage->getStorageID();
inner_table_id = StorageID(inner_create_query->getDatabase(), inner_create_query->getTable());
}
clean_interval_ms = getContext()->getSettingsRef().window_view_clean_interval.totalMilliseconds();
@ -1385,7 +1384,6 @@ void StorageWindowView::shutdown()
auto table_id = getStorageID();
DatabaseCatalog::instance().removeDependency(select_table_id, table_id);
inner_storage.reset();
}
void StorageWindowView::checkTableCanBeDropped() const
@ -1443,16 +1441,12 @@ Block & StorageWindowView::getHeader() const
StoragePtr StorageWindowView::getParentStorage() const
{
if (!parent_storage)
parent_storage = DatabaseCatalog::instance().getTable(select_table_id, getContext());
return parent_storage;
return DatabaseCatalog::instance().getTable(select_table_id, getContext());
}
StoragePtr StorageWindowView::getInnerStorage() const
{
if (!inner_storage)
inner_storage = DatabaseCatalog::instance().getTable(inner_table_id, getContext());
return inner_storage;
return DatabaseCatalog::instance().getTable(inner_table_id, getContext());
}
ASTPtr StorageWindowView::getFetchColumnQuery(UInt32 w_start, UInt32 w_end) const
@ -1502,9 +1496,7 @@ ASTPtr StorageWindowView::getFetchColumnQuery(UInt32 w_start, UInt32 w_end) cons
StoragePtr StorageWindowView::getTargetStorage() const
{
if (!target_storage && !target_table_id.empty())
target_storage = DatabaseCatalog::instance().getTable(target_table_id, getContext());
return target_storage;
return DatabaseCatalog::instance().getTable(target_table_id, getContext());
}
void registerStorageWindowView(StorageFactory & factory)

3
src/Storages/WindowView/StorageWindowView.h
View File

@ -206,9 +206,6 @@ private:
StorageID select_table_id = StorageID::createEmpty();
StorageID target_table_id = StorageID::createEmpty();
StorageID inner_table_id = StorageID::createEmpty();
mutable StoragePtr parent_storage;
mutable StoragePtr inner_storage;
mutable StoragePtr target_storage;
BackgroundSchedulePool::TaskHolder clean_cache_task;
BackgroundSchedulePool::TaskHolder fire_task;