Merge pull request #7913 from ClickHouse/prewhere_max_parallel_replicas

Fix prewhere with max_parallel_replicas.

dbms/src/Interpreters/InterpreterSelectQuery.cpp

@@ -668,7 +668,7 @@ InterpreterSelectQuery::analyzeExpressions(
         ExpressionActionsChain chain(context);
         Names additional_required_columns_after_prewhere;
 
-        if (storage && query.sample_size())
+        if (storage && (query.sample_size() || context.getSettingsRef().parallel_replicas_count > 1))
         {
             Names columns_for_sampling = storage->getColumnsRequiredForSampling();
             additional_required_columns_after_prewhere.insert(additional_required_columns_after_prewhere.end(),

dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.reference

+99

dbms/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas.sql

+drop table if exists test_max_parallel_replicas_lr;
+
+-- If you wonder why the table is named with "_lr" suffix in this test.
+-- No reason. Actually it is the name of the table in Yandex.Market and they provided this test case for us.
+
+CREATE TABLE test_max_parallel_replicas_lr (timestamp UInt64) ENGINE = MergeTree ORDER BY (intHash32(timestamp)) SAMPLE BY intHash32(timestamp);
+INSERT INTO test_max_parallel_replicas_lr select number as timestamp from system.numbers limit 100;
+
+SET max_parallel_replicas = 2;
+select count() FROM remote('127.0.0.{2|3}', currentDatabase(), test_max_parallel_replicas_lr) PREWHERE timestamp > 0;
+
+drop table test_max_parallel_replicas_lr;