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

remove dangerous optimisation

Browse Source
This commit is contained in:
chertus 2020-02-20 20:19:16 +03:00
parent 56fa3cc1eb
commit f683437a8c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/src/Interpreters/JoinSwitcher.cpp
View File

@ -31,11 +31,6 @@ JoinSwitcher::JoinSwitcher(std::shared_ptr<AnalyzedJoin> table_join_, const Bloc
bool JoinSwitcher::addJoinedBlock(const Block & block, bool)
{
/// Trying to make MergeJoin without lock
if (switched.load(std::memory_order_relaxed))
return join->addJoinedBlock(block);
std::lock_guard lock(switch_mutex);
if (switched)

2
dbms/src/Interpreters/JoinSwitcher.h
View File

@ -64,7 +64,7 @@ public:
private:
JoinPtr join;
SizeLimits limits;
mutable std::atomic<bool> switched;
bool switched;
mutable std::mutex switch_mutex;
std::shared_ptr<AnalyzedJoin> table_join;
const Block right_sample_block;