Add max_group_by_count config

Author: sdf-jkl

README.md

@@ -70,6 +70,7 @@ sample_interval_secs = 5
 max_column_count = 5
 max_row_count = 100
 max_expr_level = 3
+max_group_by_count = 3
 max_table_count = 3
 max_insert_per_table = 20
 ```
@@ -96,6 +97,7 @@ Options:
 - `max_column_count`: Maximum number of columns per generated table (default: 5)
 - `max_row_count`: Maximum number of rows per generated table (default: 100)
 - `max_expr_level`: Maximum expression nesting level (default: 3)
+- `max_group_by_count`: Maximum number of `GROUP BY` expressions (default: 3)
 
 ## Progress Tracker
 ### SQL Features

datafusion-fuzzer.toml

@@ -28,6 +28,7 @@ sample_interval_secs = 5
 max_column_count = 5
 max_row_count = 100
 max_expr_level = 3
+max_group_by_count = 3
 max_table_count = 3
 max_insert_per_table = 20
 

src/cli/runner.rs

@@ -480,6 +480,7 @@ mod tests {
             max_column_count: 3,
             max_row_count: 10,
             max_expr_level: 2,
+            max_group_by_count: 2,
             max_table_count: 3,
             max_insert_per_table: 20,
             oracles: vec![crate::oracle::ConfiguredOracle::NoCrash],
@@ -599,6 +600,7 @@ mod tests {
             max_column_count: 3,
             max_row_count: 10,
             max_expr_level: 2,
+            max_group_by_count: 2,
             max_table_count: 3,
             max_insert_per_table: 20,
             oracles: vec![crate::oracle::ConfiguredOracle::NoCrash],

src/fuzz_context/runner_config.rs

@@ -30,6 +30,8 @@ pub struct RunnerConfig {
     pub max_column_count: u64,
     pub max_row_count: u64,
     pub max_expr_level: u32,
+    #[serde(default = "RunnerConfig::default_max_group_by_count")]
+    pub max_group_by_count: u32,
     pub max_table_count: u32,
     pub max_insert_per_table: u32,
     #[serde(default = "RunnerConfig::default_oracles", alias = "oracle")]
@@ -100,6 +102,10 @@ impl RunnerConfig {
     fn default_oracles() -> Vec<ConfiguredOracle> {
         vec![ConfiguredOracle::NoCrash]
     }
+
+    fn default_max_group_by_count() -> u32 {
+        3
+    }
 }
 
 impl Default for RunnerConfig {
@@ -116,6 +122,7 @@ impl Default for RunnerConfig {
             max_column_count: 5,
             max_row_count: 100,
             max_expr_level: 3,
+            max_group_by_count: Self::default_max_group_by_count(),
             max_table_count: 3,
             max_insert_per_table: 20,
             oracles: Self::default_oracles(),
@@ -142,6 +149,7 @@ sample_interval_secs = 5
 max_column_count = 5
 max_row_count = 100
 max_expr_level = 3
+max_group_by_count = 3
 max_table_count = 3
 max_insert_per_table = 20
 oracles = ["NoCrash"]
@@ -167,6 +175,7 @@ sample_interval_secs = 5
 max_column_count = 5
 max_row_count = 100
 max_expr_level = 3
+max_group_by_count = 3
 max_table_count = 3
 max_insert_per_table = 20
 oracles = ["NoCrash", "NestedQueries", "TlpWhere", "TlpHaving"]
@@ -200,6 +209,7 @@ sample_interval_secs = 5
 max_column_count = 5
 max_row_count = 100
 max_expr_level = 3
+max_group_by_count = 3
 max_table_count = 3
 max_insert_per_table = 20
 oracles = []

src/query_generator/stmt_select_def.rs

@@ -434,7 +434,7 @@ impl SelectStatementBuilder {
 
         let max_group_by_exprs = src_columns
             .len()
-            .min(self.ctx.runner_config.max_expr_level as usize);
+            .min(self.ctx.runner_config.max_group_by_count as usize);
         if max_group_by_exprs == 0 {
             return Ok(Vec::new());
         }