CTTY commented on code in PR #1646: URL: https://github.com/apache/iceberg-rust/pull/1646#discussion_r2320509706
########## crates/iceberg/src/writer/file_writer/clustered_writer.rs: ########## @@ -0,0 +1,155 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use arrow_array::RecordBatch; +use arrow_schema::SchemaRef as ArrowSchemaRef; + +use crate::arrow::record_batch_partition_splitter::RecordBatchPartitionSplitter; +use crate::spec::{DataFileBuilder, PartitionKey, PartitionSpecRef, SchemaRef}; +use crate::writer::CurrentFileStatus; +use crate::writer::file_writer::{FileWriter, FileWriterBuilder}; +use crate::{Error, ErrorKind, Result}; + +/// todo doc +#[derive(Clone)] +pub struct ClusteredWriterBuilder<B: FileWriterBuilder> { + inner_builder: B, + partition_spec: PartitionSpecRef, + table_schema: SchemaRef, + arrow_schema: ArrowSchemaRef, +} + +impl<B: FileWriterBuilder> ClusteredWriterBuilder<B> { + #[allow(dead_code)] + pub fn new( + inner_builder: B, + partition_spec: PartitionSpecRef, + table_schema: SchemaRef, + arrow_schema: ArrowSchemaRef, + ) -> Self { + Self { + inner_builder, + partition_spec, + table_schema, + arrow_schema, + } + } +} + +impl<B: FileWriterBuilder> FileWriterBuilder for ClusteredWriterBuilder<B> { + type R = ClusteredWriter<B>; + + async fn build(self) -> Result<Self::R> { + let splitter = RecordBatchPartitionSplitter::new( + self.arrow_schema, + self.table_schema.clone(), + self.partition_spec.clone(), + )?; + + Ok(ClusteredWriter { + inner: None, + inner_builder: self.inner_builder, + splitter, + table_schema: self.table_schema, + partition_spec: self.partition_spec, + current_partition_key: None, + data_file_builders: vec![], + }) + } +} + +pub struct ClusteredWriter<B: FileWriterBuilder> { + inner: Option<B::R>, + inner_builder: B, + splitter: RecordBatchPartitionSplitter, + table_schema: SchemaRef, + partition_spec: PartitionSpecRef, + current_partition_key: Option<PartitionKey>, + data_file_builders: Vec<DataFileBuilder>, +} + +impl<B: FileWriterBuilder> FileWriter for ClusteredWriter<B> { + async fn write(&mut self, batch: &RecordBatch) -> Result<()> { + let splits = self.splitter.split(batch)?; + if splits.len() > 1 { + // todo revisit this, should we assume one batch can contain at most one partition's data? + return Err(Error::new( + ErrorKind::DataInvalid, + "Records from multiple partitions found in one record batch!", + )); + } + + if let Some((partition_value, record_batch)) = splits.first() { + let partition_key = PartitionKey::new( + self.partition_spec.as_ref().clone(), + self.table_schema.clone(), + partition_value.clone(), + ); + + if self + .current_partition_key + .as_ref() + .is_none_or(|pk| pk != &partition_key) + { + if let Some(inner) = self.inner.take() { + // Close the current writer, roll to a new file + self.data_file_builders.extend(inner.close().await?); + + // Start a new writer + // TODO how to pass partition key to inner builder?? Review Comment: Hi @liurenjie1024 , I think we've discussed a while ago that we don't really need a new `PartitionWriter` trait, as using the decorator pattern should be enough, but I'm having second thought here: it's tricky to configure `PartitionKey` for the `inner_builder` without changing the `FileBuilder` trait.. I feel like we need to change at least the FileWriterBuilder trait: ``` trait FileWriterBuilder { ... fn with_partition_key(); } ``` Would love to hear your thoughts! -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
