simplify

alamb · Oct 9, 2024 · 61ab262 · 61ab262
1 parent addd225
commit 61ab262
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs b/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs
@@ -83,8 +83,7 @@ async fn test_basic_prim_aggr_no_group() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res)
+    fuzzer.run().await
 }
 
 /// Fuzz test for `basic prim aggr(sum/sum distinct/max/min/count/avg)` + `group by single int64`
@@ -122,8 +121,7 @@ async fn test_basic_prim_aggr_group_by_single_int64() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic prim aggr(sum/sum distinct/max/min/count/avg)` + `group by single string`
@@ -161,8 +159,7 @@ async fn test_basic_prim_aggr_group_by_single_string() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic prim aggr(sum/sum distinct/max/min/count/avg)` + `group by string + int64`
@@ -201,8 +198,7 @@ async fn test_basic_prim_aggr_group_by_mixed_string_int64() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic string aggr(count/count distinct/min/max)` + `no group by`
@@ -230,8 +226,7 @@ async fn test_basic_string_aggr_no_group() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic string aggr(count/count distinct/min/max)` + `group by single int64`
@@ -268,8 +263,7 @@ async fn test_basic_string_aggr_group_by_single_int64() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic string aggr(count/count distinct/min/max)` + `group by single string`
@@ -306,8 +300,7 @@ async fn test_basic_string_aggr_group_by_single_string() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 /// Fuzz test for `basic string aggr(count/count distinct/min/max)` + `group by string + int64`
@@ -345,8 +338,7 @@ async fn test_basic_string_aggr_group_by_mixed_string_int64() {
         .table_name("fuzz_table")
         .build();
 
-    let res = fuzzer.run().await;
-    unwrap_and_report(res);
+    fuzzer.run().await;
 }
 
 // ========================================================================
@@ -714,12 +706,3 @@ fn extract_result_counts(results: Vec<RecordBatch>) -> HashMap<Option<String>, i
     }
     output
 }
-
-/// if res is an error, prints the erorr message neatly (e.g. with newlines
-/// expanded) before panic'ing
-fn unwrap_and_report(res: Result<()>) {
-    if let Err(e) = res {
-        println!("{e}");
-        panic!("Error!");
-    }
-}
diff --git a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs
@@ -133,8 +133,17 @@ struct QueryGroup {
 }
 
 impl AggregationFuzzer {
-    /// Run the fuzzer, returning error if any inconsistency found
-    pub async fn run(&self) -> Result<()> {
+    /// Run the fuzzer, printing an error and panicking if any of the tasks fail
+    pub async fn run(&self) {
+        let res = self.run_inner().await;
+
+        if let Err(e) = res {
+            println!("{e}");
+            panic!("Error!");
+        }
+    }
+
+    async fn run_inner(&self) -> Result<()> {
         let mut join_set = JoinSet::new();
         let mut rng = thread_rng();