You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by "ZENOTME (via GitHub)" <gi...@apache.org> on 2024/11/19 13:18:40 UTC
[PR] feat: Add equality delete writer [iceberg-rust]
ZENOTME opened a new pull request, #703:
URL: https://github.com/apache/iceberg-rust/pull/703
This PR fix tests and refines the interface based on #372
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1858032287
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,261 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id of meta of field.
+#[derive(Clone)]
+pub struct RecordBatchProjector {
Review Comment:
We should make this `pub(crate)`, otherwise it would be easy to leak this when export module by mistake.
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,261 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id of meta of field.
+#[derive(Clone)]
+pub struct RecordBatchProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl RecordBatchProjector {
+ /// Init ArrowFieldProjector
+ pub fn new<F>(
+ original_schema: SchemaRef,
+ field_ids: &[i32],
+ field_id_fetch_func: F,
+ ) -> Result<Self>
+ where
+ F: Fn(&Field) -> Option<i64>,
+ {
+ let mut field_indices = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ if let Ok(field) = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ &field_id_fetch_func,
+ ) {
+ fields.push(field.clone());
+ field_indices.push(field_index);
+ } else {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ format!(
+ "Can't find source column id or column data type invalid: {}",
+ id
+ ),
+ ));
+ }
Review Comment:
```suggestion
Self::fetch_field_index(
original_schema.fields(),
&mut field_index,
id as i64,
&field_id_fetch_func,
) ?;
fields.push(field.clone());
field_indices.push(field_index);
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,421 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use arrow_array::RecordBatch;
+use arrow_schema::SchemaRef;
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
Review Comment:
I still don't understand why we ask user to pass an arrow schema here?I think the original_schema is table schema, right? It would be more convenient to pass iceberg schema for user?
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,261 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id of meta of field.
+#[derive(Clone)]
+pub struct RecordBatchProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl RecordBatchProjector {
+ /// Init ArrowFieldProjector
+ pub fn new<F>(
+ original_schema: SchemaRef,
+ field_ids: &[i32],
+ field_id_fetch_func: F,
+ ) -> Result<Self>
+ where
+ F: Fn(&Field) -> Option<i64>,
+ {
+ let mut field_indices = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ if let Ok(field) = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ &field_id_fetch_func,
+ ) {
+ fields.push(field.clone());
+ field_indices.push(field_index);
+ } else {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ format!(
+ "Can't find source column id or column data type invalid: {}",
+ id
+ ),
+ ));
+ }
+ }
+ let delete_arrow_schema = Arc::new(Schema::new(fields));
+ Ok(Self {
+ field_indices,
+ projected_schema: delete_arrow_schema,
+ })
+ }
+
+ fn fetch_field_index<F>(
+ fields: &Fields,
+ index_vec: &mut Vec<usize>,
+ target_field_id: i64,
+ field_id_fetch_func: &F,
+ ) -> Result<FieldRef>
+ where
+ F: Fn(&Field) -> Option<i64>,
+ {
+ for (pos, field) in fields.iter().enumerate() {
+ match field.data_type() {
+ DataType::Float16 | DataType::Float32 | DataType::Float64 => {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ "Delete column data type cannot be float or double",
+ ));
+ }
Review Comment:
Why this check happens here? It means that any field is float then we throw an error, even it's not deletion field? Also as a column batch projector, we should not do this since this is iceberg specific logic.
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,261 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id of meta of field.
+#[derive(Clone)]
+pub struct RecordBatchProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl RecordBatchProjector {
+ /// Init ArrowFieldProjector
+ pub fn new<F>(
+ original_schema: SchemaRef,
+ field_ids: &[i32],
+ field_id_fetch_func: F,
+ ) -> Result<Self>
+ where
+ F: Fn(&Field) -> Option<i64>,
Review Comment:
```suggestion
F: Fn(&Field) -> Result<i64>,
```
The return type here should be a result as it's possible to have error happened.
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,421 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use arrow_array::RecordBatch;
+use arrow_schema::SchemaRef;
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let projector = RecordBatchProjector::new(original_schema, &equality_ids, |field| {
+ field
+ .metadata()
+ .get(PARQUET_FIELD_ID_META_KEY)
+ .and_then(|value| value.parse::<i64>().ok())
+ })?;
+ Ok(Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ })
+ }
+
+ /// Return projected Schema
+ pub fn projected_schema_ref(&self) -> &SchemaRef {
Review Comment:
Should this be crate private?
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1855688069
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// Writer used to write equality delete files.
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
Review Comment:
```suggestion
"Equality delete inner writer has been closed.",
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the column id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
Review Comment:
This is like an enhanced version of [this method](https://docs.rs/arrow/latest/arrow/record_batch/struct.RecordBatch.html#method.project), which handles nested schema. Also this is too arrow specific, so I would following changes:
1. Move this struct to arrow module
2. We could maintain the logic here for now, but it's better to contribute back to arrow community.
3. I still prefer this to be crate private, as user only need to pass `equality_field_id` list to build the writer config.
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// Writer used to write equality delete files.
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
Review Comment:
```suggestion
equality_field_ids: Vec<i32>,
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// Writer used to write equality delete files.
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the fields id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl ArrowFieldProjector {
+ /// Init ArrowFieldProjector
+ pub fn new(original_schema: SchemaRef, field_ids: &[usize]) -> Result<Self> {
+ let mut field_indexs = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ if let Ok(field) = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ PARQUET_FIELD_ID_META_KEY,
+ ) {
+ fields.push(field.clone());
+ field_indexs.push(field_index);
+ } else {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ format!(
+ "Can't find source column id or column data type invalid: {}",
+ id
+ ),
+ ));
+ }
+ }
+ let delete_arrow_schema = Arc::new(Schema::new(fields));
+ Ok(Self {
+ field_indices: field_indexs,
+ projected_schema: delete_arrow_schema,
+ })
+ }
+
+ fn fetch_field_index(
Review Comment:
Use arrow schema visitor to simplify this?
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// Writer used to write equality delete files.
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
Review Comment:
```suggestion
"Equality delete inner writer has been closed.",
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
Review Comment:
I think user doesn't need to pass this, they just need to pass original iceberg schema.
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1856341663
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
Review Comment:
How about letting the user get projected schema from configš¤ Like:
```
let config = EqualityDeleteWriterConfig::new(original_schema);
let projected_schema = config.projected_schema();
```
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1860040274
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,502 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::RecordBatch;
+use arrow_schema::{DataType, Field, SchemaRef as ArrowSchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::arrow::schema_to_arrow_schema;
+use crate::spec::{DataFile, SchemaRef, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let original_arrow_schema = Arc::new(schema_to_arrow_schema(&original_schema)?);
+ let projector = RecordBatchProjector::new(
+ original_arrow_schema,
+ &equality_ids,
+ // The following rule comes from https://iceberg.apache.org/spec/#identifier-field-ids
+ // - The identifier field ids must be used for primitive types.
+ // - The identifier field ids must not be used for floating point types or nullable fields.
+ // - The identifier field ids can be nested field of struct but not nested field of nullable struct.
+ |field| {
+ // Only primitive type is allowed to be used for identifier field ids
+ if field.is_nullable()
+ || !field.data_type().is_primitive()
+ || matches!(
+ field.data_type(),
+ DataType::Float16 | DataType::Float32 | DataType::Float64
+ )
Review Comment:
[This part decides whether this field is possible to be the identifier field](https://iceberg.apache.org/spec/#identifier-field-ids:~:text=Float%2C%20double%2C%20and%20optional%20fields%20cannot%20be%20used%20as%20identifier%20fields).
searchable_field_func is used to decide whether we should search the struct. [We need this because a nested field cannot be used as an identifier field if it is nested in an optional struct](https://iceberg.apache.org/spec/#identifier-field-ids:~:text=a%20nested%20field%20cannot%20be%20used%20as%20an%20identifier%20field%20if%20it%20is%20nested%20in%20an%20optional%20struct).
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1850434941
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
Review Comment:
`fn close(self)` of file writer need the owenership. So we need to using option here is to take out the writer when we call close. Same thing happened in data file writer. https://github.com/apache/iceberg-rust/blob/697a20060f2247da87f73073e8bf5ab407bd40ea/crates/iceberg/src/writer/base_writer/data_file_writer.rs#L81
Maybe workaround is make `fn close(self)` of file writer to `fn close(&mut self)`, but same thing will happen in file writer. We need to wrap parquet writer in Option. But the benefit is we can hide it in lower layer.
https://github.com/apache/iceberg-rust/blob/697a20060f2247da87f73073e8bf5ab407bd40ea/crates/iceberg/src/writer/file_writer/parquet_writer.rs#L410
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1860035033
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,502 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::RecordBatch;
+use arrow_schema::{DataType, Field, SchemaRef as ArrowSchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::arrow::schema_to_arrow_schema;
+use crate::spec::{DataFile, SchemaRef, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let original_arrow_schema = Arc::new(schema_to_arrow_schema(&original_schema)?);
+ let projector = RecordBatchProjector::new(
+ original_arrow_schema,
+ &equality_ids,
+ // The following rule comes from https://iceberg.apache.org/spec/#identifier-field-ids
+ // - The identifier field ids must be used for primitive types.
+ // - The identifier field ids must not be used for floating point types or nullable fields.
+ // - The identifier field ids can be nested field of struct but not nested field of nullable struct.
+ |field| {
+ // Only primitive type is allowed to be used for identifier field ids
+ if field.is_nullable()
+ || !field.data_type().is_primitive()
+ || matches!(
+ field.data_type(),
+ DataType::Float16 | DataType::Float32 | DataType::Float64
+ )
+ {
+ return Ok(None);
+ }
+ Ok(Some(
+ field
+ .metadata()
+ .get(PARQUET_FIELD_ID_META_KEY)
+ .ok_or_else(|| {
+ Error::new(ErrorKind::Unexpected, "Field metadata is missing.")
+ })?
+ .parse::<i64>()
+ .map_err(|e| Error::new(ErrorKind::Unexpected, e.to_string()))?,
+ ))
+ },
+ |field: &Field| !field.is_nullable(),
+ )?;
+ Ok(Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ })
+ }
+
+ /// Return projected Schema
+ pub fn projected_schema_ref(&self) -> &ArrowSchemaRef {
Review Comment:
We should expose this interface so that users can use it. https://github.com/apache/iceberg-rust/pull/703#discussion_r1856341663
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1856217345
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,538 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<usize>,
+ // Projector used to project the data chunk into specific fields.
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// Writer used to write equality delete files.
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the fields id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl ArrowFieldProjector {
+ /// Init ArrowFieldProjector
+ pub fn new(original_schema: SchemaRef, field_ids: &[usize]) -> Result<Self> {
+ let mut field_indexs = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ if let Ok(field) = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ PARQUET_FIELD_ID_META_KEY,
+ ) {
+ fields.push(field.clone());
+ field_indexs.push(field_index);
+ } else {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ format!(
+ "Can't find source column id or column data type invalid: {}",
+ id
+ ),
+ ));
+ }
+ }
+ let delete_arrow_schema = Arc::new(Schema::new(fields));
+ Ok(Self {
+ field_indices: field_indexs,
+ projected_schema: delete_arrow_schema,
+ })
+ }
+
+ fn fetch_field_index(
Review Comment:
This requires a new `visit_`, e.g we need to stop vistor following field when we reach the target field, otherwise we need something like stop flag to indicates that the field has been fetch. So I doubt this will really simplify the code.
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1858083873
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,261 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id of meta of field.
+#[derive(Clone)]
+pub struct RecordBatchProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl RecordBatchProjector {
+ /// Init ArrowFieldProjector
+ pub fn new<F>(
+ original_schema: SchemaRef,
+ field_ids: &[i32],
+ field_id_fetch_func: F,
+ ) -> Result<Self>
+ where
+ F: Fn(&Field) -> Option<i64>,
+ {
+ let mut field_indices = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ if let Ok(field) = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ &field_id_fetch_func,
+ ) {
+ fields.push(field.clone());
+ field_indices.push(field_index);
+ } else {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ format!(
+ "Can't find source column id or column data type invalid: {}",
+ id
+ ),
+ ));
+ }
+ }
+ let delete_arrow_schema = Arc::new(Schema::new(fields));
+ Ok(Self {
+ field_indices,
+ projected_schema: delete_arrow_schema,
+ })
+ }
+
+ fn fetch_field_index<F>(
+ fields: &Fields,
+ index_vec: &mut Vec<usize>,
+ target_field_id: i64,
+ field_id_fetch_func: &F,
+ ) -> Result<FieldRef>
+ where
+ F: Fn(&Field) -> Option<i64>,
+ {
+ for (pos, field) in fields.iter().enumerate() {
+ match field.data_type() {
+ DataType::Float16 | DataType::Float32 | DataType::Float64 => {
+ return Err(Error::new(
+ ErrorKind::DataInvalid,
+ "Delete column data type cannot be float or double",
+ ));
+ }
Review Comment:
Yes, my bad. I'm trying to separate this out.
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1850443990
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the column id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
Review Comment:
> Also, do we actually need to expose this struct?
Yes, this struct can help the user to get the projected schema from the original schema. Our lowel writer API requires user to provide the final schema in file writer, see:
https://github.com/apache/iceberg-rust/blob/ac29484cf05f369860930dd7f5192a2b0afecdc3/crates/iceberg/src/writer/base_writer/equality_delete_writer.rs#L477
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1860022862
##########
crates/iceberg/src/arrow/record_batch_projector.rs:
##########
@@ -0,0 +1,288 @@
+// 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 std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
+
+use crate::error::Result;
+use crate::{Error, ErrorKind};
+
+/// Help to project specific field from `RecordBatch`` according to the fields id.
+#[derive(Clone)]
+pub(crate) struct RecordBatchProjector {
+ // A vector of vectors, where each inner vector represents the index path to access a specific field in a nested structure.
+ // E.g. [[0], [1, 2]] means the first field is accessed directly from the first column,
+ // while the second field is accessed from the second column and then from its third subcolumn (second column must be a struct column).
+ field_indices: Vec<Vec<usize>>,
+ // The schema reference after projection. This schema is derived from the original schema based on the given field IDs.
+ projected_schema: SchemaRef,
+}
+
+impl RecordBatchProjector {
+ /// Init ArrowFieldProjector
+ ///
+ /// This function will iterate through the field and fetch the field from the original schema according to the field ids.
+ /// The function to fetch the field id from the field is provided by `field_id_fetch_func`, return None if the field need to be skipped.
+ /// This function will iterate through the nested fields if the field is a struct, `searchable_field_func` can be used to control whether
+ /// iterate into the nested fields.
+ pub(crate) fn new<F1, F2>(
+ original_schema: SchemaRef,
+ field_ids: &[i32],
+ field_id_fetch_func: F1,
+ searchable_field_func: F2,
+ ) -> Result<Self>
+ where
+ F1: Fn(&Field) -> Result<Option<i64>>,
+ F2: Fn(&Field) -> bool,
+ {
+ let mut field_indices = Vec::with_capacity(field_ids.len());
+ let mut fields = Vec::with_capacity(field_ids.len());
+ for &id in field_ids {
+ let mut field_index = vec![];
+ let field = Self::fetch_field_index(
+ original_schema.fields(),
+ &mut field_index,
+ id as i64,
+ &field_id_fetch_func,
+ &searchable_field_func,
+ )?
+ .ok_or_else(|| Error::new(ErrorKind::Unexpected, "Field not found"))?;
Review Comment:
```suggestion
.ok_or_else(|| Error::new(ErrorKind::Unexpected, "Field not found").with_context("field_id", id)?;
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,502 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::RecordBatch;
+use arrow_schema::{DataType, Field, SchemaRef as ArrowSchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::arrow::schema_to_arrow_schema;
+use crate::spec::{DataFile, SchemaRef, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let original_arrow_schema = Arc::new(schema_to_arrow_schema(&original_schema)?);
+ let projector = RecordBatchProjector::new(
+ original_arrow_schema,
+ &equality_ids,
+ // The following rule comes from https://iceberg.apache.org/spec/#identifier-field-ids
+ // - The identifier field ids must be used for primitive types.
+ // - The identifier field ids must not be used for floating point types or nullable fields.
+ // - The identifier field ids can be nested field of struct but not nested field of nullable struct.
+ |field| {
+ // Only primitive type is allowed to be used for identifier field ids
+ if field.is_nullable()
+ || !field.data_type().is_primitive()
+ || matches!(
+ field.data_type(),
+ DataType::Float16 | DataType::Float32 | DataType::Float64
+ )
+ {
+ return Ok(None);
+ }
+ Ok(Some(
+ field
+ .metadata()
+ .get(PARQUET_FIELD_ID_META_KEY)
+ .ok_or_else(|| {
+ Error::new(ErrorKind::Unexpected, "Field metadata is missing.")
+ })?
+ .parse::<i64>()
+ .map_err(|e| Error::new(ErrorKind::Unexpected, e.to_string()))?,
+ ))
+ },
+ |field: &Field| !field.is_nullable(),
+ )?;
+ Ok(Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ })
+ }
+
+ /// Return projected Schema
+ pub fn projected_schema_ref(&self) -> &ArrowSchemaRef {
Review Comment:
```suggestion
pub(crate) fn projected_schema_ref(&self) -> &ArrowSchemaRef {
```
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,502 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::RecordBatch;
+use arrow_schema::{DataType, Field, SchemaRef as ArrowSchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::arrow::schema_to_arrow_schema;
+use crate::spec::{DataFile, SchemaRef, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let original_arrow_schema = Arc::new(schema_to_arrow_schema(&original_schema)?);
+ let projector = RecordBatchProjector::new(
+ original_arrow_schema,
+ &equality_ids,
+ // The following rule comes from https://iceberg.apache.org/spec/#identifier-field-ids
+ // - The identifier field ids must be used for primitive types.
+ // - The identifier field ids must not be used for floating point types or nullable fields.
+ // - The identifier field ids can be nested field of struct but not nested field of nullable struct.
+ |field| {
+ // Only primitive type is allowed to be used for identifier field ids
+ if field.is_nullable()
+ || !field.data_type().is_primitive()
+ || matches!(
+ field.data_type(),
+ DataType::Float16 | DataType::Float32 | DataType::Float64
+ )
Review Comment:
I think this part should belong to the search_id_func?
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1858556644
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,421 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use arrow_array::RecordBatch;
+use arrow_schema::SchemaRef;
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
Review Comment:
Make sense
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 merged PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1855711268
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the column id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
Review Comment:
> I still prefer this to be crate private, as user only need to pass equality_field_id list to build the writer config.
But how does the user pass the projected schema to the parquet writer?
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1861419228
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,502 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::RecordBatch;
+use arrow_schema::{DataType, Field, SchemaRef as ArrowSchemaRef};
+use itertools::Itertools;
+use parquet::arrow::PARQUET_FIELD_ID_META_KEY;
+
+use crate::arrow::record_batch_projector::RecordBatchProjector;
+use crate::arrow::schema_to_arrow_schema;
+use crate::spec::{DataFile, SchemaRef, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ // Field ids used to determine row equality in equality delete files.
+ equality_ids: Vec<i32>,
+ // Projector used to project the data chunk into specific fields.
+ projector: RecordBatchProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<i32>,
+ original_schema: SchemaRef,
+ partition_value: Option<Struct>,
+ ) -> Result<Self> {
+ let original_arrow_schema = Arc::new(schema_to_arrow_schema(&original_schema)?);
+ let projector = RecordBatchProjector::new(
+ original_arrow_schema,
+ &equality_ids,
+ // The following rule comes from https://iceberg.apache.org/spec/#identifier-field-ids
+ // - The identifier field ids must be used for primitive types.
+ // - The identifier field ids must not be used for floating point types or nullable fields.
+ // - The identifier field ids can be nested field of struct but not nested field of nullable struct.
+ |field| {
+ // Only primitive type is allowed to be used for identifier field ids
+ if field.is_nullable()
+ || !field.data_type().is_primitive()
+ || matches!(
+ field.data_type(),
+ DataType::Float16 | DataType::Float32 | DataType::Float64
+ )
+ {
+ return Ok(None);
+ }
+ Ok(Some(
+ field
+ .metadata()
+ .get(PARQUET_FIELD_ID_META_KEY)
+ .ok_or_else(|| {
+ Error::new(ErrorKind::Unexpected, "Field metadata is missing.")
+ })?
+ .parse::<i64>()
+ .map_err(|e| Error::new(ErrorKind::Unexpected, e.to_string()))?,
+ ))
+ },
+ |field: &Field| !field.is_nullable(),
+ )?;
+ Ok(Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ })
+ }
+
+ /// Return projected Schema
+ pub fn projected_schema_ref(&self) -> &ArrowSchemaRef {
Review Comment:
```suggestion
pub fn projected_arrow_schema_ref(&self) -> &ArrowSchemaRef {
```
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] feat: Add equality delete writer [iceberg-rust]
Posted by "liurenjie1024 (via GitHub)" <gi...@apache.org>.
liurenjie1024 commented on code in PR #703:
URL: https://github.com/apache/iceberg-rust/pull/703#discussion_r1850357817
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the column id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
Review Comment:
Also, do we actually need to expose this struct?
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
Review Comment:
When a `None` value makes sense? It seems that `None` always trigger error.
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
Review Comment:
Is this field id? Please add some comments here.
##########
crates/iceberg/src/writer/base_writer/equality_delete_writer.rs:
##########
@@ -0,0 +1,544 @@
+// 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.
+
+//! This module provide `EqualityDeleteWriter`.
+
+use std::sync::Arc;
+
+use arrow_array::{ArrayRef, RecordBatch, StructArray};
+use arrow_schema::{DataType, FieldRef, Fields, Schema, SchemaRef};
+use itertools::Itertools;
+
+use crate::spec::{DataFile, Struct};
+use crate::writer::file_writer::{FileWriter, FileWriterBuilder};
+use crate::writer::{IcebergWriter, IcebergWriterBuilder};
+use crate::{Error, ErrorKind, Result};
+
+/// Builder for `EqualityDeleteWriter`.
+#[derive(Clone)]
+pub struct EqualityDeleteFileWriterBuilder<B: FileWriterBuilder> {
+ inner: B,
+}
+
+impl<B: FileWriterBuilder> EqualityDeleteFileWriterBuilder<B> {
+ /// Create a new `EqualityDeleteFileWriterBuilder` using a `FileWriterBuilder`.
+ pub fn new(inner: B) -> Self {
+ Self { inner }
+ }
+}
+
+/// Config for `EqualityDeleteWriter`.
+pub struct EqualityDeleteWriterConfig {
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Struct,
+}
+
+impl EqualityDeleteWriterConfig {
+ /// Create a new `DataFileWriterConfig` with equality ids.
+ pub fn new(
+ equality_ids: Vec<usize>,
+ projector: ArrowFieldProjector,
+ partition_value: Option<Struct>,
+ ) -> Self {
+ Self {
+ equality_ids,
+ projector,
+ partition_value: partition_value.unwrap_or(Struct::empty()),
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriterBuilder for EqualityDeleteFileWriterBuilder<B> {
+ type R = EqualityDeleteFileWriter<B>;
+ type C = EqualityDeleteWriterConfig;
+
+ async fn build(self, config: Self::C) -> Result<Self::R> {
+ Ok(EqualityDeleteFileWriter {
+ inner_writer: Some(self.inner.clone().build().await?),
+ projector: config.projector,
+ equality_ids: config.equality_ids,
+ partition_value: config.partition_value,
+ })
+ }
+}
+
+/// A writer write data
+pub struct EqualityDeleteFileWriter<B: FileWriterBuilder> {
+ inner_writer: Option<B::R>,
+ projector: ArrowFieldProjector,
+ equality_ids: Vec<usize>,
+ partition_value: Struct,
+}
+
+#[async_trait::async_trait]
+impl<B: FileWriterBuilder> IcebergWriter for EqualityDeleteFileWriter<B> {
+ async fn write(&mut self, batch: RecordBatch) -> Result<()> {
+ let batch = self.projector.project_bacth(batch)?;
+ if let Some(writer) = self.inner_writer.as_mut() {
+ writer.write(&batch).await
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+
+ async fn close(&mut self) -> Result<Vec<DataFile>> {
+ if let Some(writer) = self.inner_writer.take() {
+ Ok(writer
+ .close()
+ .await?
+ .into_iter()
+ .map(|mut res| {
+ res.content(crate::spec::DataContentType::EqualityDeletes);
+ res.equality_ids(self.equality_ids.iter().map(|id| *id as i32).collect_vec());
+ res.partition(self.partition_value.clone());
+ res.build().expect("msg")
+ })
+ .collect_vec())
+ } else {
+ Err(Error::new(
+ ErrorKind::Unexpected,
+ "Equality delete inner writer does not exist",
+ ))
+ }
+ }
+}
+
+/// Help to project specific field from `RecordBatch`` according to the column id.
+#[derive(Clone)]
+pub struct ArrowFieldProjector {
Review Comment:
I'm quite confusing what's the meaning of each field, please add more comment here.
--
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: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org