From ab0761c6439814de8e4d9648cdd8205e85db086e Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Wed, 14 Jan 2015 17:29:10 +0300 Subject: [PATCH] dbms: Server: queries with several replicas: development [#METR-14410] --- dbms/include/DB/DataStreams/RemoteBlockInputStream.h | 4 +--- dbms/src/Client/ReplicasConnections.cpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h index d161b8aa170..d65f3a9c62c 100644 --- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h +++ b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h @@ -121,9 +121,7 @@ protected: } if (use_many_replicas) { - /// XXX Какой из этих вариантов правильный? - /// 1. Выбрать одно соединение, например connection[0], и к нему применить sendExternalTablesData(res)? - /// 2. Отправить res по всем соединениям? <- this one!!! + /// XXX Отправить res по всем соединениям. //replicas_connections->sendExternalTablesData(res); } else diff --git a/dbms/src/Client/ReplicasConnections.cpp b/dbms/src/Client/ReplicasConnections.cpp index fad763bea31..5cd973d48dc 100644 --- a/dbms/src/Client/ReplicasConnections.cpp +++ b/dbms/src/Client/ReplicasConnections.cpp @@ -81,6 +81,7 @@ namespace DB if (info.packet_number == next_packet_number) { + ++info.packet_number; ++next_packet_number; return packet; }