Skip to content

Commit 966b5b1

Browse files
committed
Address comments
1 parent 0191a9f commit 966b5b1

3 files changed

Lines changed: 21 additions & 15 deletions

File tree

kernel/src/engine/plans/json.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use url::Url;
77
use crate::plans::{Plan, PlanExecutor, QueryPlanBuilder};
88
use crate::schema::SchemaRef;
99
use crate::{
10-
DeltaResult, EngineData, FileDataReadResultIterator, FileMeta, FilteredEngineData, JsonHandler,
11-
PredicateRef,
10+
DeltaResult, EngineData, Error, FileDataReadResultIterator, FileMeta, FilteredEngineData,
11+
JsonHandler, PredicateRef,
1212
};
1313

1414
/// A [`JsonHandler`] that delegates to a [`PlanExecutor`].
@@ -30,7 +30,9 @@ impl JsonHandler for PlanBasedJsonHandler {
3030
_json_strings: Box<dyn EngineData>,
3131
_output_schema: SchemaRef,
3232
) -> DeltaResult<Box<dyn EngineData>> {
33-
todo!("PlanBasedJsonHandler does not support parse_json yet");
33+
Err(Error::unsupported(
34+
"PlanBasedJsonHandler does not support parse_json yet",
35+
))
3436
}
3537

3638
fn read_json_files(
@@ -52,7 +54,9 @@ impl JsonHandler for PlanBasedJsonHandler {
5254
_data: Box<dyn Iterator<Item = DeltaResult<FilteredEngineData>> + Send + '_>,
5355
_overwrite: bool,
5456
) -> DeltaResult<()> {
55-
todo!("PlanBasedJsonHandler does not support write_json_file yet");
57+
Err(Error::unsupported(
58+
"PlanBasedJsonHandler does not support write_json_file yet",
59+
))
5660
}
5761
}
5862

kernel/src/engine/plans/parquet.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use url::Url;
77
use crate::plans::{Plan, PlanExecutor, QueryPlanBuilder};
88
use crate::schema::SchemaRef;
99
use crate::{
10-
DeltaResult, EngineData, FileDataReadResultIterator, FileMeta, ParquetFooter, ParquetHandler,
11-
PredicateRef,
10+
DeltaResult, EngineData, Error, FileDataReadResultIterator, FileMeta, ParquetFooter,
11+
ParquetHandler, PredicateRef,
1212
};
1313

1414
/// A [`ParquetHandler`] that delegates to a [`PlanExecutor`].
@@ -43,11 +43,15 @@ impl ParquetHandler for PlanBasedParquetHandler {
4343
_location: Url,
4444
_data: Box<dyn Iterator<Item = DeltaResult<Box<dyn EngineData>>> + Send>,
4545
) -> DeltaResult<()> {
46-
todo!("PlanBasedParquetHandler does not support write_parquet_file");
46+
Err(Error::unsupported(
47+
"PlanBasedParquetHandler does not support write_parquet_file yet",
48+
))
4749
}
4850

4951
fn read_parquet_footer(&self, _file: &FileMeta) -> DeltaResult<ParquetFooter> {
50-
todo!("PlanBasedParquetHandler does not support read_parquet_footer");
52+
Err(Error::unsupported(
53+
"PlanBasedParquetHandler does not support read_parquet_footer yet",
54+
))
5155
}
5256
}
5357

kernel/src/engine/plans/storage.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use std::sync::Arc;
44

55
use bytes::Bytes;
6-
use itertools::Itertools;
6+
use itertools::Itertools as _;
77
use url::Url;
88

99
use crate::plans::{IoOperation, Plan, PlanExecutor, PlanResult};
@@ -29,20 +29,18 @@ impl StorageHandler for PlanBasedStorageHandler {
2929
&self,
3030
path: &Url,
3131
) -> DeltaResult<Box<dyn Iterator<Item = DeltaResult<FileMeta>>>> {
32-
let iter = self
32+
Ok(self
3333
.execute_io(IoOperation::file_listing(path.clone()))?
34-
.into_file_meta()?;
35-
Ok(iter)
34+
.into_file_meta()?)
3635
}
3736

3837
fn read_files(
3938
&self,
4039
files: Vec<FileSlice>,
4140
) -> DeltaResult<Box<dyn Iterator<Item = DeltaResult<Bytes>>>> {
42-
let iter = self
41+
Ok(self
4342
.execute_io(IoOperation::read_bytes(files))?
44-
.into_bytes()?;
45-
Ok(iter)
43+
.into_bytes()?)
4644
}
4745

4846
fn copy_atomic(&self, src: &Url, dest: &Url) -> DeltaResult<()> {

0 commit comments

Comments
 (0)