Skip to content

Commit ad66fa5

Browse files
committed
some minor changes
1 parent 9eae229 commit ad66fa5

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

crates/iceberg/src/writer/base_writer/data_file_writer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
2020
use arrow_array::RecordBatch;
2121
use itertools::Itertools;
22-
use crate::io::OutputFile;
22+
2323
use crate::Result;
24+
use crate::io::OutputFile;
2425
use crate::spec::{DataContentType, DataFile, Struct};
2526
use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
2627
use crate::writer::{CurrentFileStatus, IcebergWriter, IcebergWriterBuilder};

crates/iceberg/src/writer/base_writer/equality_delete_writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
2626

2727
use crate::arrow::record_batch_projector::RecordBatchProjector;
2828
use crate::arrow::schema_to_arrow_schema;
29+
use crate::io::OutputFile;
2930
use crate::spec::{DataFile, SchemaRef, Struct};
3031
use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
3132
use crate::writer::{IcebergWriter, IcebergWriterBuilder};
3233
use crate::{Error, ErrorKind, Result};
33-
use crate::io::OutputFile;
3434

3535
/// Builder for `EqualityDeleteWriter`.
3636
#[derive(Clone, Debug)]

crates/iceberg/src/writer/file_writer/parquet_writer.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ use crate::arrow::{
4242
use crate::io::{FileIO, FileWrite, OutputFile};
4343
use crate::spec::{
4444
DataContentType, DataFileBuilder, DataFileFormat, Datum, ListType, Literal, MapType,
45-
NestedFieldRef, PartitionSpec, PrimitiveType, Schema, SchemaRef, SchemaVisitor,
46-
Struct, StructType, TableMetadata, Type, visit_schema,
45+
NestedFieldRef, PartitionSpec, PrimitiveType, Schema, SchemaRef, SchemaVisitor, Struct,
46+
StructType, TableMetadata, Type, visit_schema,
4747
};
4848
use crate::transform::create_transform_function;
4949
use crate::writer::{CurrentFileStatus, DataFile};
@@ -60,10 +60,7 @@ pub struct ParquetWriterBuilder {
6060
impl ParquetWriterBuilder {
6161
/// Create a new `ParquetWriterBuilder`
6262
/// To construct the write result, the schema should contain the `PARQUET_FIELD_ID_META_KEY` metadata for each field.
63-
pub fn new(
64-
props: WriterProperties,
65-
schema: SchemaRef,
66-
) -> Self {
63+
pub fn new(props: WriterProperties, schema: SchemaRef) -> Self {
6764
Self::new_with_match_mode(props, schema, FieldMatchMode::Id)
6865
}
6966

crates/iceberg/src/writer/file_writer/rolling_writer.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ where
4242
file_name_generator: F,
4343
file_io: FileIO,
4444
partition_key: Option<PartitionKey>,
45-
data_files: Vec<DataFile>, // this should be B::R::O? DefaultOutput?
45+
data_files: Vec<DataFile>, // todo this should be B::R::O? DefaultOutput?
4646
}
4747

4848
impl<B, L, F> RollingWriter<B, L, F>
@@ -122,8 +122,7 @@ where
122122
if self.should_roll() {
123123
if let Some(mut inner) = self.inner.take() {
124124
// close the current writer, roll to a new file
125-
let mut data_files = inner.close().await?;
126-
self.data_files.append(&mut data_files);
125+
self.data_files.extend(inner.close().await?);
127126

128127
// start a new writer
129128
self.inner = Some(self.create_new_writer().await?);
@@ -145,8 +144,7 @@ where
145144
pub async fn close(&mut self) -> Result<Vec<DataFile>> {
146145
// close the current writer and merge the output
147146
if let Some(mut current_writer) = self.inner.take() {
148-
let data_files = current_writer.close().await?;
149-
self.data_files.extend(data_files);
147+
self.data_files.extend(current_writer.close().await?);
150148
}
151149

152150
Ok(std::mem::take(&mut self.data_files))

0 commit comments

Comments
 (0)