Make QueryAnalyzer respect rewrite_count_distinct_if_with_count_distinct_implementation setting

novikd · novikd · commit 384c73394153 · 2024-06-12T15:40:06.000+02:00
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -985,15 +985,15 @@ std::string QueryAnalyzer::rewriteAggregateFunctionNameIfNeeded(
     {
         result_aggregate_function_name = settings.count_distinct_implementation;
     }
-    else if (aggregate_function_name_lowercase == "countdistinctif" || aggregate_function_name_lowercase == "countifdistinct")
+    else if (settings.rewrite_count_distinct_if_with_count_distinct_implementation &&
+        (aggregate_function_name_lowercase == "countdistinctif" || aggregate_function_name_lowercase == "countifdistinct"))
     {
         result_aggregate_function_name = settings.count_distinct_implementation;
         result_aggregate_function_name += "If";
     }
-
-    /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal
-    if (aggregate_function_name_lowercase.ends_with("ifdistinct"))
+    else if (aggregate_function_name_lowercase.ends_with("ifdistinct"))
     {
+        /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal
         size_t prefix_length = result_aggregate_function_name.size() - strlen("ifdistinct");
         result_aggregate_function_name = result_aggregate_function_name.substr(0, prefix_length) + "DistinctIf";
     }

Original file line number	Diff line number	Diff line change
`@@ -985,15 +985,15 @@ std::string QueryAnalyzer::rewriteAggregateFunctionNameIfNeeded(`
`985`	`985`	`{`
`986`	`986`	`result_aggregate_function_name = settings.count_distinct_implementation;`
`987`	`987`	`}`
`988`		`- else if (aggregate_function_name_lowercase == "countdistinctif" \|\| aggregate_function_name_lowercase == "countifdistinct")`
	`988`	`+ else if (settings.rewrite_count_distinct_if_with_count_distinct_implementation &&`
	`989`	`+ (aggregate_function_name_lowercase == "countdistinctif" \|\| aggregate_function_name_lowercase == "countifdistinct"))`
`989`	`990`	`{`
`990`	`991`	`result_aggregate_function_name = settings.count_distinct_implementation;`
`991`	`992`	`result_aggregate_function_name += "If";`
`992`	`993`	`}`
`993`		`-`
`994`		`- /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal`
`995`		`- if (aggregate_function_name_lowercase.ends_with("ifdistinct"))`
	`994`	`+ else if (aggregate_function_name_lowercase.ends_with("ifdistinct"))`
`996`	`995`	`{`
	`996`	`+ /// Replace aggregateFunctionIfDistinct into aggregateFunctionDistinctIf to make execution more optimal`
`997`	`997`	`size_t prefix_length = result_aggregate_function_name.size() - strlen("ifdistinct");`
`998`	`998`	`result_aggregate_function_name = result_aggregate_function_name.substr(0, prefix_length) + "DistinctIf";`
`999`	`999`	`}`