Backport #67522 to 24.6: Analyzer: Do not traverse unresolved subtrees

novikd · novikd · commit 8cdcaaab5f53 · 2024-08-20T15:40:46.000+02:00
diff --git a/src/Planner/findParallelReplicasQuery.cpp b/src/Planner/findParallelReplicasQuery.cpp
@@ -112,13 +112,13 @@ std::stack<const QueryNode *> getSupportingParallelReplicasQuery(const IQueryTre
     return res;
 }
 
-class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>
+class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>
 {
 public:
-    using Base = InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>;
+    using Base = InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>;
     using Base::Base;
 
-    void visitImpl(const QueryTreeNodePtr & node)
+    void enterImpl(QueryTreeNodePtr & node)
     {
         auto * table_node = node->as<TableNode>();
         auto * table_function_node = node->as<TableFunctionNode>();
@@ -133,21 +133,19 @@ class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTab
                 ColumnsDescription(storage_snapshot->getColumns(get_column_options)),
                 storage_snapshot);
 
-            auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), context);
+            auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), getContext());
 
             dummy_table_node->setAlias(node->getAlias());
             replacement_map.emplace(node.get(), std::move(dummy_table_node));
         }
     }
 
-    ContextPtr context;
     std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
 };
 
-QueryTreeNodePtr replaceTablesWithDummyTables(const QueryTreeNodePtr & query, const ContextPtr & context)
+QueryTreeNodePtr replaceTablesWithDummyTables(QueryTreeNodePtr query, const ContextPtr & context)
 {
-    ReplaceTableNodeToDummyVisitor visitor;
-    visitor.context = context;
+    ReplaceTableNodeToDummyVisitor visitor(context);
     visitor.visit(query);
 
     return query->cloneAndReplace(visitor.replacement_map);
diff --git a/src/Planner/findQueryForParallelReplicas.h b/src/Planner/findQueryForParallelReplicas.h
@@ -13,7 +13,7 @@ using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
 
 struct SelectQueryOptions;
 
-/// Find a qury which can be executed with parallel replicas up to WithMergableStage.
+/// Find a query which can be executed with parallel replicas up to WithMergableStage.
 /// Returned query will always contain some (>1) subqueries, possibly with joins.
 const QueryNode * findQueryForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options);
 
diff --git a/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.reference b/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.reference
diff --git a/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.sql b/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.sql
@@ -0,0 +1,15 @@
+create table t (number UInt64) engine MergeTree order by number;
+
+SELECT 1
+FROM
+(
+    SELECT number IN (
+            SELECT number
+            FROM view(
+                SELECT number
+                FROM numbers(1)
+            )
+        )
+    FROM t
+)
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, allow_experimental_analyzer = 1; -- { serverError CLUSTER_DOESNT_EXIST }

Original file line number	Diff line number	Diff line change
`@@ -112,13 +112,13 @@ std::stack<const QueryNode *> getSupportingParallelReplicasQuery(const IQueryTre`
`112`	`112`	`return res;`
`113`	`113`	`}`
`114`	`114`
`115`		`-class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>`
	`115`	`+class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>`
`116`	`116`	`{`
`117`	`117`	`public:`
`118`		`- using Base = InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>;`
	`118`	`+ using Base = InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>;`
`119`	`119`	`using Base::Base;`
`120`	`120`
`121`		`- void visitImpl(const QueryTreeNodePtr & node)`
	`121`	`+ void enterImpl(QueryTreeNodePtr & node)`
`122`	`122`	`{`
`123`	`123`	`auto * table_node = node->as<TableNode>();`
`124`	`124`	`auto * table_function_node = node->as<TableFunctionNode>();`
`@@ -133,21 +133,19 @@ class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTab`
`133`	`133`	`ColumnsDescription(storage_snapshot->getColumns(get_column_options)),`
`134`	`134`	`storage_snapshot);`
`135`	`135`
`136`		`- auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), context);`
	`136`	`+ auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), getContext());`
`137`	`137`
`138`	`138`	`dummy_table_node->setAlias(node->getAlias());`
`139`	`139`	`replacement_map.emplace(node.get(), std::move(dummy_table_node));`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`- ContextPtr context;`
`144`	`143`	`std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;`
`145`	`144`	`};`
`146`	`145`
`147`		`-QueryTreeNodePtr replaceTablesWithDummyTables(const QueryTreeNodePtr & query, const ContextPtr & context)`
	`146`	`+QueryTreeNodePtr replaceTablesWithDummyTables(QueryTreeNodePtr query, const ContextPtr & context)`
`148`	`147`	`{`
`149`		`- ReplaceTableNodeToDummyVisitor visitor;`
`150`		`- visitor.context = context;`
	`148`	`+ ReplaceTableNodeToDummyVisitor visitor(context);`
`151`	`149`	`visitor.visit(query);`
`152`	`150`
`153`	`151`	`return query->cloneAndReplace(visitor.replacement_map);`