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

dbms: Server: queries with several replicas: development [#METR-14410]

Browse Source
This commit is contained in:
Alexey Arno 2015-01-15 18:05:03 +03:00
parent 63b254555a
commit 74db087fa6
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/Client/ReplicasConnections.h
View File

@ -44,6 +44,10 @@ namespace DB
std::string dumpAddresses() const; std::string dumpAddresses() const;
size_t size() const;
void sendExternalTablesData(std::vector<ExternalTablesData> & data);
private: private:
using ConnectionHash = std::unordered_map<int, ConnectionInfo>; using ConnectionHash = std::unordered_map<int, ConnectionInfo>;

1
dbms/include/DB/Core/ErrorCodes.h
View File

@ -273,6 +273,7 @@ namespace ErrorCodes
CANNOT_COMPILE_CODE, CANNOT_COMPILE_CODE,
NO_AVAILABLE_REPLICA, NO_AVAILABLE_REPLICA,
UNEXPECTED_REPLICA, UNEXPECTED_REPLICA,
MISMATCH_REPLICAS_DATA_SOURCES,
POCO_EXCEPTION = 1000, POCO_EXCEPTION = 1000,
STD_EXCEPTION, STD_EXCEPTION,

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

@ -122,7 +122,7 @@ protected:
/// Отправить на удаленные сервера все временные таблицы /// Отправить на удаленные сервера все временные таблицы
void sendExternalTables() void sendExternalTables()
{ {
size_t count = use_many_replicas ? shard_replicas->size() : 1; size_t count = use_many_replicas ? replicas_connections->size() : 1;
std::vector<ExternalTablesData> instances; std::vector<ExternalTablesData> instances;
instances.reserve(count); instances.reserve(count);
@ -145,12 +145,9 @@ protected:
} }
if (use_many_replicas) if (use_many_replicas)
{ replicas_connections->sendExternalTablesData(instances);
/// XXX Отправить res по всем соединениям.
//replicas_connections->sendExternalTablesData(res);
}
else else
connection->sendExternalTablesData(res); connection->sendExternalTablesData(instances[0]);
} }
Block readImpl() override Block readImpl() override

19
dbms/src/Client/ReplicasConnections.cpp
View File

@ -236,4 +236,23 @@ namespace DB
return os.str(); return os.str();
} }
size_t ReplicasConnections::size() const
{
return connection_hash.size();
}
void ReplicasConnections::sendExternalTablesData(std::vector<ExternalTablesData> & data)
{
if (data.size() != connection_hash.size())
throw Exception("Mismatch between replicas and data sources", ErrorCodes::MISMATCH_REPLICAS_DATA_SOURCES);
auto it = data.begin();
for (auto & e : connection_hash)
{
Connection * connection = e.second.connection;
connection->sendExternalTablesData(*it);
++it;
}
}
} }