viirya commented on code in PR #7318:
URL: https://github.com/apache/arrow-rs/pull/7318#discussion_r2009207336
##########
arrow-ipc/src/writer.rs:
##########
@@ -3075,4 +3098,171 @@ mod tests {
assert_eq!(stream_bytes_written_on_flush,
expected_stream_flushed_bytes);
assert_eq!(file_bytes_written_on_flush, expected_file_flushed_bytes);
}
+
+ #[test]
+ fn test_roundtrip_list_of_fixed_list() -> Result<(), ArrowError> {
+ let l0_builder = Float32Builder::new();
+ let l1_builder = FixedSizeListBuilder::new(l0_builder, 3);
+ let mut l2_builder = ListBuilder::new(l1_builder);
+
+ for point in [[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]] {
+ l2_builder.values().values().append_value(point[0]);
+ l2_builder.values().values().append_value(point[1]);
+ l2_builder.values().values().append_value(point[2]);
+
+ l2_builder.values().append(true);
+ }
+ l2_builder.append(true);
+
+ let point = [10., 11., 12.];
+ l2_builder.values().values().append_value(point[0]);
+ l2_builder.values().values().append_value(point[1]);
+ l2_builder.values().values().append_value(point[2]);
+
+ l2_builder.values().append(true);
+ l2_builder.append(true);
+
+ let array = Arc::new(l2_builder.finish()) as ArrayRef;
+
+ let schema = Arc::new(Schema::new_with_metadata(
+ vec![Field::new(
+ "points",
+ DataType::List(Arc::new(Field::new(
+ "item",
+ DataType::FixedSizeList(
+ Arc::new(Field::new("item", DataType::Float32, true)),
+ 3,
+ ),
+ true,
+ ))),
+ true,
+ )],
+ HashMap::default(),
+ ));
+
+ // Test a variety of combinations that include 0 and non-zero offsets
+ // and also portions or the rest of the array
+ test_slices(&array, &schema, 0, 1)?;
+ test_slices(&array, &schema, 0, 2)?;
+ test_slices(&array, &schema, 1, 1)?;
+
+ Ok(())
+ }
+
+ #[test]
+ fn test_roundtrip_list_of_fixed_list_w_nulls() -> Result<(), ArrowError> {
+ let l0_builder = Float32Builder::new();
+ let l1_builder = FixedSizeListBuilder::new(l0_builder, 3);
+ let mut l2_builder = ListBuilder::new(l1_builder);
+
+ for point in [
+ [Some(1.0), Some(2.0), None],
+ [Some(4.0), Some(5.0), Some(6.0)],
+ [None, Some(8.0), Some(9.0)],
+ ] {
+ for p in point {
+ match p {
+ Some(p) => l2_builder.values().values().append_value(p),
+ None => l2_builder.values().values().append_null(),
+ }
+ }
+
+ l2_builder.values().append(true);
+ }
+ l2_builder.append(true);
+
+ let point = [Some(10.), None, None];
+ for p in point {
+ match p {
+ Some(p) => l2_builder.values().values().append_value(p),
+ None => l2_builder.values().values().append_null(),
+ }
+ }
+
+ l2_builder.values().append(true);
+ l2_builder.append(true);
+
+ let array = Arc::new(l2_builder.finish()) as ArrayRef;
+
+ let schema = Arc::new(Schema::new_with_metadata(
+ vec![Field::new(
+ "points",
+ DataType::List(Arc::new(Field::new(
+ "item",
+ DataType::FixedSizeList(
+ Arc::new(Field::new("item", DataType::Float32, true)),
+ 3,
+ ),
+ true,
+ ))),
+ true,
+ )],
+ HashMap::default(),
+ ));
+
+ // Test a variety of combinations that include 0 and non-zero offsets
+ // and also portions or the rest of the array
+ test_slices(&array, &schema, 0, 1)?;
+ test_slices(&array, &schema, 0, 2)?;
+ test_slices(&array, &schema, 1, 1)?;
+
+ Ok(())
+ }
+
+ fn test_slices(
+ parent_array: &ArrayRef,
+ schema: &SchemaRef,
+ offset: usize,
+ length: usize,
+ ) -> Result<(), ArrowError> {
+ let subarray = parent_array.slice(offset, length);
+ let original_batch = RecordBatch::try_new(schema.clone(),
vec![subarray])?;
+
+ let mut bytes = Vec::new();
+ let mut writer = StreamWriter::try_new(&mut bytes, schema)?;
+ writer.write(&original_batch)?;
+ writer.finish()?;
+
+ let mut cursor = std::io::Cursor::new(bytes);
+ let mut reader = StreamReader::try_new(&mut cursor, None)?;
+ let returned_batch = reader.next().unwrap()?;
+
+ assert_eq!(original_batch, returned_batch);
+
+ Ok(())
+ }
+
+ #[test]
+ fn test_roundtrip_fixed_list() -> Result<(), ArrowError> {
+ let int_builder = Int64Builder::new();
+ let mut fixed_list_builder = FixedSizeListBuilder::new(int_builder, 3);
+
+ for point in [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]] {
+ fixed_list_builder.values().append_value(point[0]);
+ fixed_list_builder.values().append_value(point[1]);
+ fixed_list_builder.values().append_value(point[2]);
+
+ fixed_list_builder.append(true);
+ }
+
+ let array = Arc::new(fixed_list_builder.finish()) as ArrayRef;
+
+ let schema = Arc::new(Schema::new_with_metadata(
+ vec![Field::new(
+ "points",
+ DataType::FixedSizeList(Arc::new(Field::new("item",
DataType::Int64, true)), 3),
+ true,
Review Comment:
There are no null values. Maybe update the schema to non-nullable?
--
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]
