andygrove commented on code in PR #2467:
URL: https://github.com/apache/arrow-datafusion/pull/2467#discussion_r866453099
##########
data-access/src/object_store/local.rs:
##########
@@ -50,17 +50,63 @@ impl ObjectStore for LocalFileSystem {
async fn list_dir(
&self,
- _prefix: &str,
- _delimiter: Option<String>,
+ prefix: &str,
+ delimiter: Option<String>,
) -> Result<ListEntryStream> {
- todo!()
+ if let Some(d) = delimiter {
+ if d != "/" && d != "\\" {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ "delimiter not supported on local filesystem",
+ ));
+ }
+ let mut entry_stream = tokio::fs::read_dir(prefix).await?;
+
+ let list_entries = stream::poll_fn(move |cx| {
+ entry_stream.poll_next_entry(cx).map(|res| match res {
+ Ok(Some(x)) => Some(Ok(x)),
+ Ok(None) => None,
+ Err(err) => Some(Err(err)),
+ })
+ })
+ .then(|entry| async {
+ let entry = entry?;
+ let entry = if entry.file_type().await?.is_dir() {
+ ListEntry::Prefix(path_as_str(&entry.path())?.to_string())
+ } else {
+ ListEntry::FileMeta(get_meta(
+ path_as_str(&entry.path())?.to_string(),
+ entry.metadata().await?,
+ ))
+ };
+ Ok(entry)
+ });
+
+ Ok(Box::pin(list_entries))
+ } else {
+ Ok(Box::pin(
+ self.list_file(prefix).await?.map_ok(ListEntry::FileMeta),
+ ))
+ }
}
fn file_reader(&self, file: SizedFile) -> Result<Arc<dyn ObjectReader>> {
Ok(Arc::new(LocalFileReader::new(file)?))
}
}
+/// Try to convert a PathBuf reference into a &str
+pub fn path_as_str(path: &std::path::Path) -> Result<&str> {
+ if let Some(child_path) = path.to_str() {
+ Ok(child_path)
+ } else {
+ Err(io::Error::new(
+ io::ErrorKind::InvalidInput,
+ "Invalid path".to_string(),
Review Comment:
It would be nice to include the path in the error message
--
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]
