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

dbms: Server: further simplification of memory ordering [#METR-14410]

Browse Source
This commit is contained in:
Alexey Arno 2015-02-27 15:00:02 +03:00
parent c5b61652ff
commit ca1c0756c2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
View File

@ -22,6 +22,7 @@ class RemoteBlockInputStream : public IProfilingBlockInputStream
private:
void init(const Settings * settings_)
{
established.store(false, std::memory_order_seq_cst);
sent_query.store(false, std::memory_order_seq_cst);
finished.store(false, std::memory_order_seq_cst);
got_exception_from_replica.store(false, std::memory_order_seq_cst);
@ -106,7 +107,7 @@ public:
* все соединения, затем читаем и пропускаем оставшиеся пакеты чтобы
* эти соединения не остались висеть в рассихронизированном состоянии.
*/
if (established || isQueryInProgress())
if (established.load(std::memory_order_seq_cst) || isQueryInProgress())
parallel_replicas->disconnect();
}
@ -144,10 +145,14 @@ protected:
if (!sent_query.load(std::memory_order_seq_cst))
{
createParallelReplicas();
established = true;
established.store(true, std::memory_order_seq_cst);
parallel_replicas->sendQuery(query, "", stage, true);
established = false;
established.store(false, std::memory_order_seq_cst);
sent_query.store(true, std::memory_order_seq_cst);
sendExternalTables();
}
@ -319,7 +324,7 @@ private:
Context context;
/// Установили соединения с репликами, но ещё не отправили запрос.
volatile bool established = false;
std::atomic<bool> established;
/// Отправили запрос (это делается перед получением первого блока).
std::atomic<bool> sent_query;