Remove WindowDefinition from EXPLAIN AST output (#83)

kyleconroy · web-flow · commit 0d6bbbe500ea · 2025-12-29T09:48:52.000-08:00
diff --git a/internal/explain/functions.go b/internal/explain/functions.go
@@ -77,21 +77,10 @@ func explainFunctionCallWithAlias(sb *strings.Builder, n *ast.FunctionCall, alia
 	}
 }
 
-// windowSpecHasContent returns true if the window spec has any content
-// (PartitionBy, OrderBy, or Frame with offset). Empty OVER () returns false.
+// windowSpecHasContent returns true if the window spec has any content.
+// ClickHouse EXPLAIN AST never includes WindowDefinition nodes for window
+// functions, even when OVER clause has PARTITION BY, ORDER BY, or frame specs.
 func windowSpecHasContent(w *ast.WindowSpec) bool {
-	if w == nil {
-		return false
-	}
-	if len(w.PartitionBy) > 0 {
-		return true
-	}
-	if len(w.OrderBy) > 0 {
-		return true
-	}
-	if w.Frame != nil && w.Frame.StartBound != nil && w.Frame.StartBound.Offset != nil {
-		return true
-	}
 	return false
 }
 
diff --git a/parser/testdata/01568_window_functions_distributed/metadata.json b/parser/testdata/01568_window_functions_distributed/metadata.json
@@ -1,7 +1 @@
-{
-  "explain_todo": {
-    "stmt1": true,
-    "stmt14": true,
-    "stmt2": true
-  }
-}
+{}
diff --git a/parser/testdata/01571_window_functions/metadata.json b/parser/testdata/01571_window_functions/metadata.json
@@ -1,9 +1,6 @@
 {
   "explain_todo": {
-    "stmt10": true,
     "stmt12": true,
-    "stmt3": true,
-    "stmt7": true,
-    "stmt9": true
+    "stmt3": true
   }
 }
diff --git a/parser/testdata/01591_window_functions/metadata.json b/parser/testdata/01591_window_functions/metadata.json
@@ -1,8 +1,5 @@
 {
   "explain_todo": {
-    "stmt10": true,
-    "stmt100": true,
-    "stmt101": true,
     "stmt102": true,
     "stmt103": true,
     "stmt104": true,
@@ -11,35 +8,20 @@
     "stmt107": true,
     "stmt108": true,
     "stmt109": true,
-    "stmt11": true,
     "stmt110": true,
     "stmt111": true,
     "stmt112": true,
-    "stmt12": true,
-    "stmt14": true,
-    "stmt16": true,
-    "stmt17": true,
-    "stmt21": true,
-    "stmt22": true,
-    "stmt23": true,
     "stmt28": true,
-    "stmt29": true,
     "stmt31": true,
-    "stmt32": true,
     "stmt34": true,
     "stmt35": true,
     "stmt36": true,
     "stmt37": true,
     "stmt38": true,
     "stmt39": true,
-    "stmt40": true,
     "stmt41": true,
-    "stmt42": true,
-    "stmt43": true,
-    "stmt44": true,
     "stmt45": true,
     "stmt46": true,
-    "stmt48": true,
     "stmt50": true,
     "stmt51": true,
     "stmt52": true,
@@ -48,16 +30,7 @@
     "stmt55": true,
     "stmt56": true,
     "stmt57": true,
-    "stmt58": true,
-    "stmt59": true,
-    "stmt6": true,
-    "stmt60": true,
-    "stmt61": true,
-    "stmt64": true,
-    "stmt65": true,
-    "stmt68": true,
     "stmt69": true,
-    "stmt7": true,
     "stmt70": true,
     "stmt71": true,
     "stmt72": true,
@@ -78,7 +51,6 @@
     "stmt87": true,
     "stmt88": true,
     "stmt89": true,
-    "stmt9": true,
     "stmt90": true,
     "stmt91": true,
     "stmt92": true,
@@ -87,7 +59,6 @@
     "stmt95": true,
     "stmt96": true,
     "stmt97": true,
-    "stmt98": true,
-    "stmt99": true
+    "stmt98": true
   }
 }
diff --git a/parser/testdata/01592_long_window_functions1/metadata.json b/parser/testdata/01592_long_window_functions1/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt10": true
-  }
-}
+{}
diff --git a/parser/testdata/01592_window_functions/metadata.json b/parser/testdata/01592_window_functions/metadata.json
@@ -1,11 +1 @@
-{
-  "explain_todo": {
-    "stmt10": true,
-    "stmt12": true,
-    "stmt14": true,
-    "stmt16": true,
-    "stmt18": true,
-    "stmt20": true,
-    "stmt8": true
-  }
-}
+{}
diff --git a/parser/testdata/01655_window_functions_cume_dist/metadata.json b/parser/testdata/01655_window_functions_cume_dist/metadata.json
@@ -1,15 +1 @@
-{
-  "explain_todo": {
-    "stmt12": true,
-    "stmt16": true,
-    "stmt20": true,
-    "stmt21": true,
-    "stmt22": true,
-    "stmt24": true,
-    "stmt26": true,
-    "stmt28": true,
-    "stmt3": true,
-    "stmt5": true,
-    "stmt7": true
-  }
-}
+{}
diff --git a/parser/testdata/01802_rank_corr_mann_whitney_over_window/metadata.json b/parser/testdata/01802_rank_corr_mann_whitney_over_window/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt4": true
-  }
-}
+{}
diff --git a/parser/testdata/02020_exponential_smoothing_cross_block/metadata.json b/parser/testdata/02020_exponential_smoothing_cross_block/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt1": true
-  }
-}
+{}
diff --git a/parser/testdata/02126_lc_window_functions/metadata.json b/parser/testdata/02126_lc_window_functions/metadata.json
@@ -1,8 +1,6 @@
 {
   "explain_todo": {
-    "stmt2": true,
     "stmt3": true,
-    "stmt4": true,
-    "stmt5": true
+    "stmt4": true
   }
 }
diff --git a/parser/testdata/02129_window_functions_disable_optimizations/metadata.json b/parser/testdata/02129_window_functions_disable_optimizations/metadata.json
@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt4": true,
-    "stmt6": true
-  }
-}
+{}
diff --git a/parser/testdata/02306_window_move_row_number_fix/metadata.json b/parser/testdata/02306_window_move_row_number_fix/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt1": true
-  }
-}
+{}
diff --git a/parser/testdata/02346_non_negative_derivative/metadata.json b/parser/testdata/02346_non_negative_derivative/metadata.json
@@ -1,21 +1 @@
-{
-  "explain_todo": {
-    "stmt10": true,
-    "stmt11": true,
-    "stmt12": true,
-    "stmt13": true,
-    "stmt14": true,
-    "stmt15": true,
-    "stmt16": true,
-    "stmt17": true,
-    "stmt18": true,
-    "stmt19": true,
-    "stmt20": true,
-    "stmt21": true,
-    "stmt22": true,
-    "stmt6": true,
-    "stmt7": true,
-    "stmt8": true,
-    "stmt9": true
-  }
-}
+{}
diff --git a/parser/testdata/02366_window_function_order_by/metadata.json b/parser/testdata/02366_window_function_order_by/metadata.json
@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt2": true,
-    "stmt3": true
-  }
-}
+{}
diff --git a/parser/testdata/02428_combinators_with_over_statement/metadata.json b/parser/testdata/02428_combinators_with_over_statement/metadata.json
@@ -1 +1 @@
-{"explain_todo":{"stmt5":true,"stmt6":true,"stmt7":true,"stmt8":true,"stmt9":true}}
+{}
diff --git a/parser/testdata/02513_analyzer_sort_msan/metadata.json b/parser/testdata/02513_analyzer_sort_msan/metadata.json
@@ -1 +1 @@
-{"explain_todo":{"stmt5":true}}
+{}
diff --git a/parser/testdata/02532_analyzer_aggregation_with_rollup/metadata.json b/parser/testdata/02532_analyzer_aggregation_with_rollup/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt2": true
-  }
-}
+{}
diff --git a/parser/testdata/02560_window_ntile/metadata.json b/parser/testdata/02560_window_ntile/metadata.json
@@ -1,23 +1 @@
-{
-  "explain_todo": {
-    "stmt1": true,
-    "stmt10": true,
-    "stmt11": true,
-    "stmt12": true,
-    "stmt13": true,
-    "stmt14": true,
-    "stmt15": true,
-    "stmt16": true,
-    "stmt17": true,
-    "stmt18": true,
-    "stmt19": true,
-    "stmt2": true,
-    "stmt3": true,
-    "stmt4": true,
-    "stmt5": true,
-    "stmt6": true,
-    "stmt7": true,
-    "stmt8": true,
-    "stmt9": true
-  }
-}
+{}
diff --git a/parser/testdata/02561_sorting_constants_and_distinct_crash/metadata.json b/parser/testdata/02561_sorting_constants_and_distinct_crash/metadata.json
@@ -1,7 +1,6 @@
 {
   "explain_todo": {
     "stmt3": true,
-    "stmt5": true,
     "stmt7": true
   }
 }
diff --git a/parser/testdata/02833_window_func_range_offset/metadata.json b/parser/testdata/02833_window_func_range_offset/metadata.json
@@ -1,8 +1 @@
-{
-  "explain_todo": {
-    "stmt1": true,
-    "stmt2": true,
-    "stmt3": true,
-    "stmt4": true
-  }
-}
+{}
diff --git a/parser/testdata/02884_parallel_window_functions/metadata.json b/parser/testdata/02884_parallel_window_functions/metadata.json
@@ -1,8 +1,5 @@
 {
   "explain_todo": {
-    "stmt2": true,
-    "stmt3": true,
-    "stmt4": true,
-    "stmt6": true
+    "stmt2": true
   }
 }
diff --git a/parser/testdata/02884_parallel_window_functions_bug/metadata.json b/parser/testdata/02884_parallel_window_functions_bug/metadata.json
@@ -1,7 +1,6 @@
 {
   "explain_todo": {
     "stmt1": true,
-    "stmt2": true,
-    "stmt5": true
+    "stmt2": true
   }
 }
diff --git a/parser/testdata/02900_window_function_with_sparse_column/metadata.json b/parser/testdata/02900_window_function_with_sparse_column/metadata.json
@@ -1,9 +1,5 @@
 {
   "explain_todo": {
-    "stmt3": true,
-    "stmt4": true,
-    "stmt5": true,
-    "stmt7": true,
-    "stmt8": true
+    "stmt7": true
   }
 }
diff --git a/parser/testdata/02922_respect_nulls_extensive/metadata.json b/parser/testdata/02922_respect_nulls_extensive/metadata.json
@@ -1,31 +1,13 @@
 {
   "explain_todo": {
-    "stmt1": true,
-    "stmt10": true,
-    "stmt11": true,
-    "stmt12": true,
-    "stmt13": true,
-    "stmt14": true,
-    "stmt15": true,
-    "stmt2": true,
-    "stmt3": true,
-    "stmt32": true,
-    "stmt33": true,
-    "stmt34": true,
-    "stmt35": true,
     "stmt36": true,
     "stmt38": true,
-    "stmt4": true,
     "stmt40": true,
     "stmt41": true,
     "stmt42": true,
     "stmt44": true,
     "stmt46": true,
     "stmt47": true,
-    "stmt5": true,
-    "stmt6": true,
-    "stmt7": true,
-    "stmt8": true,
-    "stmt9": true
+    "stmt6": true
   }
 }
diff --git a/parser/testdata/02962_parallel_window_functions_different_partitioning/metadata.json b/parser/testdata/02962_parallel_window_functions_different_partitioning/metadata.json
@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt5": true,
-    "stmt6": true
-  }
-}
+{}
diff --git a/parser/testdata/03037_precent_rank/metadata.json b/parser/testdata/03037_precent_rank/metadata.json
@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt12": true,
-    "stmt9": true
-  }
-}
+{}
diff --git a/parser/testdata/03095_window_functions_qualify/metadata.json b/parser/testdata/03095_window_functions_qualify/metadata.json
@@ -1,8 +1 @@
-{
-  "explain_todo": {
-    "stmt12": true,
-    "stmt14": true,
-    "stmt2": true,
-    "stmt4": true
-  }
-}
+{}
diff --git a/parser/testdata/03112_analyzer_not_found_column_in_block/metadata.json b/parser/testdata/03112_analyzer_not_found_column_in_block/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt5": true
-  }
-}
+{}
diff --git a/parser/testdata/03122_analyzer_collate_in_window_function/metadata.json b/parser/testdata/03122_analyzer_collate_in_window_function/metadata.json
@@ -1,5 +1 @@
-{
-  "explain_todo": {
-    "stmt6": true
-  }
-}
+{}
diff --git a/parser/testdata/03146_tpc_ds_grouping/metadata.json b/parser/testdata/03146_tpc_ds_grouping/metadata.json
@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt3": true,
-    "stmt4": true
-  }
-}
+{}
diff --git a/parser/testdata/03165_distinct_with_window_func_crash/metadata.json b/parser/testdata/03165_distinct_with_window_func_crash/metadata.json
diff --git a/parser/testdata/03173_forbid_qualify/metadata.json b/parser/testdata/03173_forbid_qualify/metadata.json
diff --git a/parser/testdata/03205_parallel_window_finctions_and_column_sparse_bug/metadata.json b/parser/testdata/03205_parallel_window_finctions_and_column_sparse_bug/metadata.json
diff --git a/parser/testdata/03213_denseRank_percentRank_alias/metadata.json b/parser/testdata/03213_denseRank_percentRank_alias/metadata.json
diff --git a/parser/testdata/03262_common_expression_optimization/metadata.json b/parser/testdata/03262_common_expression_optimization/metadata.json
diff --git a/parser/testdata/03447_window_functions_distinct/metadata.json b/parser/testdata/03447_window_functions_distinct/metadata.json
diff --git a/parser/testdata/03448_window_functions_distinct_distributed/metadata.json b/parser/testdata/03448_window_functions_distinct_distributed/metadata.json
diff --git a/parser/testdata/03538_analyzer_lag_lead_functions/metadata.json b/parser/testdata/03538_analyzer_lag_lead_functions/metadata.json
diff --git a/parser/testdata/03549_window_collation/metadata.json b/parser/testdata/03549_window_collation/metadata.json
diff --git a/parser/testdata/03611_window_definition_parsing/metadata.json b/parser/testdata/03611_window_definition_parsing/metadata.json
diff --git a/parser/testdata/03624_resource_exhaustion_window_function/metadata.json b/parser/testdata/03624_resource_exhaustion_window_function/metadata.json
diff --git a/parser/testdata/03631_select_replace_comprehensive/metadata.json b/parser/testdata/03631_select_replace_comprehensive/metadata.json
diff --git a/parser/testdata/03701_optimize_inverse_dictionary_lookup_basic/metadata.json b/parser/testdata/03701_optimize_inverse_dictionary_lookup_basic/metadata.json
diff --git a/parser/testdata/03719_ntile_no_partition_by_check/metadata.json b/parser/testdata/03719_ntile_no_partition_by_check/metadata.json

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"explain_todo": {`
`3`		`- "stmt10": true,`
`4`	`3`	`"stmt12": true,`
`5`		`- "stmt3": true,`
`6`		`- "stmt7": true,`
`7`		`- "stmt9": true`
	`4`	`+ "stmt3": true`
`8`	`5`	`}`
`9`	`6`	`}`
-Original file line number
+Diff line change
@@ @@ -1,5 +1 @@ @@
 -{
 -  "explain_todo": {
 -    "stmt10": true
 -  }
 -}
 +{}
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"explain_todo": {`
`3`		`- "stmt2": true,`
`4`	`3`	`"stmt3": true,`
`5`		`- "stmt4": true,`
`6`		`- "stmt5": true`
	`4`	`+ "stmt4": true`
`7`	`5`	`}`
`8`	`6`	`}`