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

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

Browse Source
This commit is contained in:
Alexey Arno 2015-02-04 13:40:00 +03:00
parent 51f8ad6e9d
commit d519fac7b5
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ private:
{
send_settings = true;
settings = *settings_;
use_many_replicas = (pool != nullptr) && UInt64(settings.max_parallel_replicas) > 1;
use_many_replicas = (pool != nullptr) && (settings.max_parallel_replicas > 1);
}
else
send_settings = false;

13
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -149,10 +149,7 @@ BlockInputStreams MergeTreeDataSelectExecutor::read(
relative_sample_size = 0;
}
UInt64 parallel_replicas_count = UInt64(settings.parallel_replicas_count);
UInt64 parallel_replica_offset = UInt64(settings.parallel_replica_offset);
if ((parallel_replicas_count > 1) && !data.sampling_expression.isNull() && (relative_sample_size == 0))
if ((settings.parallel_replicas_count > 1) && !data.sampling_expression.isNull() && (relative_sample_size == 0))
relative_sample_size = 1;
if (relative_sample_size != 0)
@ -175,11 +172,11 @@ BlockInputStreams MergeTreeDataSelectExecutor::read(
UInt64 sampling_column_value_upper_limit;
UInt64 upper_limit = static_cast<UInt64>(relative_sample_size * sampling_column_max);
if (parallel_replicas_count > 1)
if (settings.parallel_replicas_count > 1)
{
sampling_column_value_lower_limit = (parallel_replica_offset * upper_limit) / parallel_replicas_count;
if ((parallel_replica_offset + 1) < parallel_replicas_count)
sampling_column_value_upper_limit = ((parallel_replica_offset + 1) * upper_limit) / parallel_replicas_count;
sampling_column_value_lower_limit = (settings.parallel_replica_offset * upper_limit) / settings.parallel_replicas_count;
if ((settings.parallel_replica_offset + 1) < settings.parallel_replicas_count)
sampling_column_value_upper_limit = ((settings.parallel_replica_offset + 1) * upper_limit) / settings.parallel_replicas_count;
else
sampling_column_value_upper_limit = upper_limit + 1;
}