Skip to content

Commit fcfe92e

Browse files
committed
review: cleanup
1 parent b05d0d8 commit fcfe92e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

datafusion/sqllogictest/bin/sqllogictests.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ struct FileTiming {
7878

7979
type DataFusionConfigChangeErrors = Arc<Mutex<Vec<String>>>;
8080

81-
fn take_config_change_result(
81+
fn config_change_result(
8282
config_change_errors: &DataFusionConfigChangeErrors,
8383
) -> Result<()> {
84-
let errors = std::mem::take(&mut *config_change_errors.lock().unwrap());
84+
let errors = config_change_errors.lock().unwrap();
8585
if errors.is_empty() {
8686
Ok(())
8787
} else {
@@ -527,6 +527,8 @@ async fn run_test_file(
527527

528528
// If DataFusion configuration has changed during test file runs, errors will be
529529
// pushed to this vec.
530+
// HACK: managed externally because `sqllogictest` is an external dependnecy, and
531+
// it doesn't have an API to directly access the inner runner.
530532
let config_change_errors = Arc::new(Mutex::new(Vec::new()));
531533
let mut runner = sqllogictest::Runner::new(|| async {
532534
Ok(DataFusion::new(
@@ -548,7 +550,7 @@ async fn run_test_file(
548550

549551
// If there was no correctness error, check that the config is unchanged.
550552
runner.shutdown_async().await;
551-
take_config_change_result(&config_change_errors)
553+
config_change_result(&config_change_errors)
552554
}
553555

554556
async fn run_file_in_runner<D: AsyncDB, M: MakeConnection<Conn = D>>(
@@ -738,7 +740,7 @@ async fn run_complete_file(
738740

739741
res?;
740742
runner.shutdown_async().await;
741-
take_config_change_result(&config_change_errors)
743+
config_change_result(&config_change_errors)
742744
}
743745

744746
#[cfg(feature = "postgres")]

0 commit comments

Comments
 (0)