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

Merge pull request #15243 from ClickHouse/tavplubix-patch-1

Browse Source 
Try fix race on Context::settings
This commit is contained in:
tavplubix 2020-09-28 11:44:27 +03:00 committed by GitHub
commit ffc0499952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Interpreters/Context.cpp
View File

@ -968,6 +968,7 @@ StoragePtr Context::getViewSource()
Settings Context::getSettings() const Settings Context::getSettings() const
{ {
auto lock = getLock();
return settings; return settings;
} }

2
src/Interpreters/ProcessList.cpp
View File

@ -431,7 +431,7 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
} }
if (get_settings && query_context) if (get_settings && query_context)
res.query_settings = std::make_shared<Settings>(query_context->getSettingsRef()); res.query_settings = std::make_shared<Settings>(query_context->getSettings());
return res; return res;
} }