rluvaton commented on code in PR #10272:
URL: https://github.com/apache/arrow-rs/pull/10272#discussion_r3523789311
##########
arrow-data/src/data.rs:
##########
@@ -349,25 +343,47 @@ impl ArrayData {
)));
}
}
- // Safety justification: `validate_full` is called below
- let new_self = unsafe {
- Self::new_unchecked(
- data_type,
- len,
- None,
- null_bit_buffer,
- offset,
- buffers,
- child_data,
- )
- };
+
+ let builder = Self::inner_new_builder(
+ data_type,
+ len,
+ None,
+ null_bit_buffer,
+ offset,
+ buffers,
+ child_data,
+ );
+
+ assert!(!builder.skip_validation.get());
// As the data is not trusted, do a full validation of its contents
// We don't need to validate children as we can assume that the
// [`ArrayData`] in `child_data` have already been validated through
// a call to `ArrayData::try_new` or created using unsafe
- new_self.validate_data()?;
- Ok(new_self)
+ builder.build()
+ }
+
+ fn inner_new_builder(
+ data_type: DataType,
+ len: usize,
+ null_count: Option<usize>,
+ null_bit_buffer: Option<Buffer>,
+ offset: usize,
+ buffers: Vec<Buffer>,
+ child_data: Vec<ArrayData>,
+ ) -> ArrayDataBuilder {
+ ArrayDataBuilder {
+ data_type,
+ len,
+ null_count,
+ null_bit_buffer,
+ nulls: None,
+ offset,
+ buffers,
+ child_data,
+ align_buffers: false,
+ skip_validation: UnsafeFlag::new(),
+ }
}
Review Comment:
This is another fix extracted to:
- #10282
having this here until the other one is merged so the tests I added can pass
and not panic
--
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]
