leekeiabstraction commented on code in PR #308:
URL: https://github.com/apache/fluss-rust/pull/308#discussion_r3213019992
##########
crates/fluss/src/row/column_writer.rs:
##########
@@ -671,61 +630,694 @@ impl ColumnWriter {
Ok(())
}
TypedWriter::List {
+ element_type,
element_writer,
- offsets,
- validity,
+ builder,
+ ..
} => {
let array = row.get_array(pos)?;
- for i in 0..array.size() {
- element_writer.write_field_at(&array, i)?;
- }
- let last = *offsets.last().unwrap();
- offsets.push(
- last + i32::try_from(array.size()).map_err(|_|
RowConvertError {
- message: format!("Array size {} exceeds i32 range",
array.size()),
- })?,
- );
- validity.push(true);
+ write_fluss_array_to_list_builder(
+ &array,
+ element_type,
+ element_writer.as_mut(),
+ builder,
+ )?;
+ builder.append(true);
+ Ok(())
+ }
+ TypedWriter::Struct {
+ fields,
+ arrow_fields,
+ builder,
+ } => {
+ // Row is stored as FlussArray in CompactedRow format
+ let row_array = row.get_array(pos)?;
+ write_fluss_array_to_struct_builder(
+ &row_array,
+ fields,
+ arrow_fields,
+ builder,
+ )?;
Ok(())
}
}
}
}
-fn finish_list_array(
- values: ArrayRef,
- item_nullable: bool,
- offsets: &[i32],
- validity: &[bool],
-) -> ArrayRef {
- use arrow::array::ListArray;
- use arrow::buffer::{NullBuffer, OffsetBuffer, ScalarBuffer};
- use arrow::datatypes::{Field, FieldRef};
- use std::sync::Arc;
-
- let offsets_buffer =
OffsetBuffer::new(ScalarBuffer::from(offsets.to_vec()));
- let null_buffer = NullBuffer::from(validity.to_vec());
- let field = Arc::new(Field::new(
- "item",
- values.data_type().clone(),
- item_nullable,
- ));
- let field_ref: FieldRef = field;
-
- Arc::new(ListArray::new(
- field_ref,
- offsets_buffer,
- values,
- Some(null_buffer),
- ))
+/// Helper function to create a ListBuilder for a given element Arrow type.
+/// This uses boxed builders to allow dynamic dispatch for nested types.
+fn create_list_builder(
Review Comment:
The functions `create_list_builder`, `create_builder_for_type` and
`create_boxed_builder` are fairly similar. Can we apply DRY e.g. through
generics or macro?
##########
crates/fluss/src/row/column_writer.rs:
##########
@@ -30,22 +30,16 @@ use crate::row::datum::{
use arrow::array::{
ArrayBuilder, ArrayRef, BinaryBuilder, BooleanBuilder, Date32Builder,
Decimal128Builder,
FixedSizeBinaryBuilder, Float32Builder, Float64Builder, Int8Builder,
Int16Builder,
- Int32Builder, Int64Builder, StringBuilder, Time32MillisecondBuilder,
Time32SecondBuilder,
- Time64MicrosecondBuilder, Time64NanosecondBuilder,
TimestampMicrosecondBuilder,
- TimestampMillisecondBuilder, TimestampNanosecondBuilder,
TimestampSecondBuilder,
+ Int32Builder, Int64Builder, ListBuilder, StringBuilder, StructBuilder,
Review Comment:
I am not sure why we have changes for column writer within this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
