alamb commented on code in PR #5033:
URL: https://github.com/apache/arrow-datafusion/pull/5033#discussion_r1085118094
##########
datafusion/core/tests/sqllogictests/src/engines/postgres/mod.rs:
##########
@@ -188,8 +187,12 @@ fn no_quotes(t: &str) -> &str {
/// Given a file name like pg_compat_foo.slt
/// return a schema name
-fn schema_name(file_name: &str) -> &str {
- file_name
+fn schema_name(relative_path: &Path) -> &str {
+ relative_path
+ .file_name()
+ .unwrap()
Review Comment:
in general I think it is nice to avoid the `unwrap()` which panic's but in
this case it would happen if the filenames were non utf8 -- so I think it is ok
here
##########
datafusion/core/tests/sqllogictests/src/main.rs:
##########
@@ -110,13 +104,38 @@ async fn run_complete_file(
Ok(())
}
-fn read_test_files(options: &Options) -> Vec<PathBuf> {
- std::fs::read_dir(TEST_DIRECTORY)
- .unwrap()
- .map(|path| path.unwrap().path())
- .filter(|path| options.check_test_file(path.as_path()))
- .filter(|path| options.check_pg_compat_file(path.as_path()))
- .collect()
+fn read_test_files<'a>(
+ options: &'a Options,
+) -> Box<dyn Iterator<Item = (PathBuf, String)> + 'a> {
+ Box::new(
+ read_dir_recursive(TEST_DIRECTORY)
+ .map(|path| {
+ (
+ path.clone(),
+ path.to_string_lossy()
+ .strip_prefix(TEST_DIRECTORY)
+ .unwrap()
+ .to_string(),
+ )
+ })
+ .filter(|(_, file_name)| options.check_test_file(file_name))
+ .filter(|(path, _)| options.check_pg_compat_file(path.as_path())),
+ )
+}
+
+fn read_dir_recursive<P: AsRef<Path>>(path: P) -> Box<dyn Iterator<Item =
PathBuf>> {
Review Comment:
I agree walkdir is not needed
##########
datafusion/core/tests/sqllogictests/src/main.rs:
##########
@@ -110,13 +104,38 @@ async fn run_complete_file(
Ok(())
}
-fn read_test_files(options: &Options) -> Vec<PathBuf> {
- std::fs::read_dir(TEST_DIRECTORY)
- .unwrap()
- .map(|path| path.unwrap().path())
- .filter(|path| options.check_test_file(path.as_path()))
- .filter(|path| options.check_pg_compat_file(path.as_path()))
- .collect()
+fn read_test_files<'a>(
+ options: &'a Options,
+) -> Box<dyn Iterator<Item = (PathBuf, String)> + 'a> {
+ Box::new(
+ read_dir_recursive(TEST_DIRECTORY)
+ .map(|path| {
+ (
+ path.clone(),
+ path.to_string_lossy()
+ .strip_prefix(TEST_DIRECTORY)
+ .unwrap()
+ .to_string(),
+ )
+ })
+ .filter(|(_, file_name)| options.check_test_file(file_name))
+ .filter(|(path, _)| options.check_pg_compat_file(path.as_path())),
+ )
+}
+
+fn read_dir_recursive<P: AsRef<Path>>(path: P) -> Box<dyn Iterator<Item =
PathBuf>> {
Review Comment:
I think you might be able to avoid the Box using something like
```suggestion
fn read_dir_recursive<P: AsRef<Path>>(path: P) -> impl Iterator<Item =
PathBuf> {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
