Backport #83036 to 25.6: Read only required VIEW columns on the shards

robot-clickhouse · robot-clickhouse · commit 95bf236f5c38 · 2025-07-04T09:14:03.000Z
diff --git a/src/Analyzer/QueryTreePassManager.cpp b/src/Analyzer/QueryTreePassManager.cpp
@@ -193,8 +193,12 @@ void QueryTreePassManager::run(QueryTreeNodePtr query_tree_node)
 
 void QueryTreePassManager::runOnlyResolve(QueryTreeNodePtr query_tree_node)
 {
-    // Run only QueryAnalysisPass and GroupingFunctionsResolvePass passes.
-    run(query_tree_node, 3);
+    // Run only query tree passes that doesn't affect output header:
+    // 1. QueryAnalysisPass
+    // 2. GroupingFunctionsResolvePass
+    // 3. AutoFinalOnQueryPass
+    // 4. RemoveUnusedProjectionColumnsPass
+    run(query_tree_node, 4);
 }
 
 void QueryTreePassManager::run(QueryTreeNodePtr query_tree_node, size_t up_to_pass_index)
@@ -252,8 +256,10 @@ void addQueryTreePasses(QueryTreePassManager & manager, bool only_analyze)
     manager.addPass(std::make_unique<QueryAnalysisPass>(only_analyze));
     manager.addPass(std::make_unique<GroupingFunctionsResolvePass>());
     manager.addPass(std::make_unique<AutoFinalOnQueryPass>());
-
+    /// This pass should be run for the secondary queries
+    /// to ensure that the only required columns are read from VIEWs on the shards.
     manager.addPass(std::make_unique<RemoveUnusedProjectionColumnsPass>());
+
     manager.addPass(std::make_unique<FunctionToSubcolumnsPass>());
 
     manager.addPass(std::make_unique<ConvertLogicalExpressionToCNFPass>());
diff --git a/tests/queries/0_stateless/03550_analyzer_remote_view_columns.reference b/tests/queries/0_stateless/03550_analyzer_remote_view_columns.reference
@@ -0,0 +1,2 @@
+0
+['default.test.i1','default.test_view.i1']
diff --git a/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql b/tests/queries/0_stateless/03550_analyzer_remote_view_columns.sql
@@ -0,0 +1,42 @@
+CREATE TABLE test
+(
+    `i1` Int64,
+    `i2` Int64,
+    `i3` Int64,
+    `i4` Int64,
+    `i5` Int64,
+    `i6` Int64,
+    `i7` Int64,
+    `i8` Int64,
+    `i9` Int64,
+    `i10` Int64
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS index_granularity = 8192;
+
+CREATE VIEW test_view
+AS SELECT *
+FROM test;
+
+SET prefer_localhost_replica = 0;
+SET serialize_query_plan = 0;
+
+SELECT max(i1)
+FROM remote('localhost', currentDatabase(), test_view)
+SETTINGS log_comment = 'THIS IS A COMMENT TO MARK THE INITIAL QUERY';
+
+SYSTEM FLUSH LOGS;
+
+SELECT columns
+FROM system.query_log
+WHERE
+    initial_query_id = (
+        SELECT query_id
+        FROM system.query_log
+        WHERE
+            current_database = currentDatabase()
+            AND log_comment = 'THIS IS A COMMENT TO MARK THE INITIAL QUERY'
+        LIMIT 1)
+    AND type = 'QueryFinish'
+    AND NOT is_initial_query;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+0`
	`2`	`+['default.test.i1','default.test_view.i1']`