Do not throw exception if scope is already registered

novikd · novikd · commit cdfa32f535a9 · 2025-06-05T00:35:05.000+02:00
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -296,9 +296,7 @@ std::optional<JoinTableSide> QueryAnalyzer::getColumnSideFromJoinTree(const Quer
 
 IdentifierResolveScope & QueryAnalyzer::createIdentifierResolveScope(const QueryTreeNodePtr & scope_node, IdentifierResolveScope * parent_scope)
 {
-    auto [it, inserted] = node_to_scope_map.emplace(scope_node, IdentifierResolveScope{scope_node, parent_scope});
-    if (!inserted)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Node {} already has a scope", scope_node->formatASTForErrorMessage());
+    auto [it, _] = node_to_scope_map.emplace(scope_node, IdentifierResolveScope{scope_node, parent_scope});
     return it->second;
 }
 
@@ -2323,7 +2321,7 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
                 if (apply_transformer->getApplyTransformerType() == ApplyColumnTransformerType::LAMBDA)
                 {
                     auto lambda_expression_to_resolve = expression_node->clone();
-                    auto & lambda_scope = createIdentifierResolveScope(expression_node, /*parent_scope=*/&scope);
+                    auto & lambda_scope = createIdentifierResolveScope(lambda_expression_to_resolve, /*parent_scope=*/&scope);
                     node_projection_names = resolveLambda(expression_node, lambda_expression_to_resolve, {node}, lambda_scope);
                     auto & lambda_expression_to_resolve_typed = lambda_expression_to_resolve->as<LambdaNode &>();
                     node = lambda_expression_to_resolve_typed.getExpression();

Original file line number	Diff line number	Diff line change
`@@ -296,9 +296,7 @@ std::optional<JoinTableSide> QueryAnalyzer::getColumnSideFromJoinTree(const Quer`
`296`	`296`
`297`	`297`	`IdentifierResolveScope & QueryAnalyzer::createIdentifierResolveScope(const QueryTreeNodePtr & scope_node, IdentifierResolveScope * parent_scope)`
`298`	`298`	`{`
`299`		`- auto [it, inserted] = node_to_scope_map.emplace(scope_node, IdentifierResolveScope{scope_node, parent_scope});`
`300`		`- if (!inserted)`
`301`		`- throw Exception(ErrorCodes::LOGICAL_ERROR, "Node {} already has a scope", scope_node->formatASTForErrorMessage());`
	`299`	`+ auto [it, _] = node_to_scope_map.emplace(scope_node, IdentifierResolveScope{scope_node, parent_scope});`
`302`	`300`	`return it->second;`
`303`	`301`	`}`
`304`	`302`
`@@ -2323,7 +2321,7 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I`
`2323`	`2321`	`if (apply_transformer->getApplyTransformerType() == ApplyColumnTransformerType::LAMBDA)`
`2324`	`2322`	`{`
`2325`	`2323`	`auto lambda_expression_to_resolve = expression_node->clone();`
`2326`		`- auto & lambda_scope = createIdentifierResolveScope(expression_node, /parent_scope=/&scope);`
	`2324`	`+ auto & lambda_scope = createIdentifierResolveScope(lambda_expression_to_resolve, /parent_scope=/&scope);`
`2327`	`2325`	`node_projection_names = resolveLambda(expression_node, lambda_expression_to_resolve, {node}, lambda_scope);`
`2328`	`2326`	`auto & lambda_expression_to_resolve_typed = lambda_expression_to_resolve->as<LambdaNode &>();`
`2329`	`2327`	`node = lambda_expression_to_resolve_typed.getExpression();`