thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Igor Nikonov 2024-07-01 08:28:54 +00:00
parent 71b0ab94be
commit 6b3750ff83
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -1954,7 +1954,8 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
{ {
auto result = getAnalysisResult(); auto result = getAnalysisResult();
if (is_parallel_reading_from_replicas && context->canUseParallelReplicasOnInitiator()) if (is_parallel_reading_from_replicas && context->canUseParallelReplicasOnInitiator()
&& context->getSettingsRef().parallel_replicas_local_plan)
{ {
CoordinationMode mode = CoordinationMode::Default; CoordinationMode mode = CoordinationMode::Default;
switch (result.read_type) switch (result.read_type)

6
tests/queries/0_stateless/02841_parallel_replicas_summary.sh
View File

@ -27,7 +27,7 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE replicas_summary (n Int64) ENGINE = Mer
query_id_base="02841_summary_$CLICKHOUSE_DATABASE" query_id_base="02841_summary_$CLICKHOUSE_DATABASE"
# TODO: rethink the test, for now temporary disable allow_experimental_analyzer # TODO: rethink the test, for now temporary disable parallel_replicas_local_plan
echo " echo "
SELECT * SELECT *
FROM replicas_summary FROM replicas_summary
@ -38,7 +38,7 @@ echo "
allow_experimental_parallel_reading_from_replicas = 2, allow_experimental_parallel_reading_from_replicas = 2,
parallel_replicas_for_non_replicated_merge_tree = 1, parallel_replicas_for_non_replicated_merge_tree = 1,
interactive_delay=0, interactive_delay=0,
allow_experimental_analyzer=0 parallel_replicas_local_plan=0
"\ "\
| ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_0" --data-binary @- -vvv 2>&1 \ | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_0" --data-binary @- -vvv 2>&1 \
| grep "Summary" | grep -cv '"read_rows":"0"' | grep "Summary" | grep -cv '"read_rows":"0"'
@ -53,7 +53,7 @@ echo "
allow_experimental_parallel_reading_from_replicas = 2, allow_experimental_parallel_reading_from_replicas = 2,
parallel_replicas_for_non_replicated_merge_tree = 1, parallel_replicas_for_non_replicated_merge_tree = 1,
interactive_delay=99999999999, interactive_delay=99999999999,
allow_experimental_analyzer=0 parallel_replicas_local_plan=0
"\ "\
| ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_high" --data-binary @- -vvv 2>&1 \ | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_high" --data-binary @- -vvv 2>&1 \
| grep "Summary" | grep -cv '"read_rows":"0"' | grep "Summary" | grep -cv '"read_rows":"0"'