Skip to content

Commit 0edc3d9

Browse files
authored
Minor: include the number of files run in sqllogictest display (#14359)
* Minor: include the number of files run in sqllogictest display * fmt * Update datafusion/sqllogictest/bin/sqllogictests.rs
1 parent 7efa2f3 commit 0edc3d9

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

datafusion/sqllogictest/bin/sqllogictests.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ async fn run_tests() -> Result<()> {
120120

121121
let start = Instant::now();
122122

123-
let errors: Vec<_> = futures::stream::iter(read_test_files(&options)?)
123+
let test_files = read_test_files(&options)?;
124+
let num_tests = test_files.len();
125+
let errors: Vec<_> = futures::stream::iter(test_files)
124126
.map(|test_file| {
125127
let validator = if options.include_sqlite
126128
&& test_file.relative_path.starts_with(SQLITE_PREFIX)
@@ -184,7 +186,11 @@ async fn run_tests() -> Result<()> {
184186
.collect()
185187
.await;
186188

187-
m.println(format!("Completed in {}", HumanDuration(start.elapsed())))?;
189+
m.println(format!(
190+
"Completed {} test files in {}",
191+
num_tests,
192+
HumanDuration(start.elapsed())
193+
))?;
188194

189195
#[cfg(feature = "postgres")]
190196
terminate_postgres_container().await?;
@@ -491,9 +497,7 @@ impl TestFile {
491497
}
492498
}
493499

494-
fn read_test_files<'a>(
495-
options: &'a Options,
496-
) -> Result<Box<dyn Iterator<Item = TestFile> + 'a>> {
500+
fn read_test_files(options: &Options) -> Result<Vec<TestFile>> {
497501
let mut paths = read_dir_recursive(TEST_DIRECTORY)?
498502
.into_iter()
499503
.map(TestFile::new)
@@ -516,7 +520,7 @@ fn read_test_files<'a>(
516520
paths.append(&mut sqlite_paths)
517521
}
518522

519-
Ok(Box::new(paths.into_iter()))
523+
Ok(paths)
520524
}
521525

522526
/// Parsed command line options

0 commit comments

Comments
 (0)