From 1b8343990cbb0004469d91a876cd58a00be6ca4a Mon Sep 17 00:00:00 2001 From: Jiayu Liu Date: Sat, 19 Jun 2021 21:01:52 +0800 Subject: [PATCH] remove stale comment and update unit tests --- arrow/src/array/array_struct.rs | 24 ++---------------------- arrow/src/array/builder.rs | 24 ++---------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/arrow/src/array/array_struct.rs b/arrow/src/array/array_struct.rs index 9c11b8301f5..f721d35ce9f 100644 --- a/arrow/src/array/array_struct.rs +++ b/arrow/src/array/array_struct.rs @@ -362,28 +362,8 @@ mod tests { .add_buffer(Buffer::from(&[1, 2, 0, 4].to_byte_slice())) .build(); - assert_eq!(&expected_string_data, arr.column(0).data()); - - // TODO: implement equality for ArrayData - assert_eq!(expected_int_data.len(), arr.column(1).data().len()); - assert_eq!( - expected_int_data.null_count(), - arr.column(1).data().null_count() - ); - assert_eq!( - expected_int_data.null_bitmap(), - arr.column(1).data().null_bitmap() - ); - let expected_value_buf = expected_int_data.buffers()[0].clone(); - let actual_value_buf = arr.column(1).data().buffers()[0].clone(); - for i in 0..expected_int_data.len() { - if !expected_int_data.is_null(i) { - assert_eq!( - expected_value_buf.as_slice()[i * 4..(i + 1) * 4], - actual_value_buf.as_slice()[i * 4..(i + 1) * 4] - ); - } - } + assert_eq!(expected_string_data, *arr.column(0).data()); + assert_eq!(expected_int_data, *arr.column(1).data()); } #[test] diff --git a/arrow/src/array/builder.rs b/arrow/src/array/builder.rs index eacd7642121..66f2d818f72 100644 --- a/arrow/src/array/builder.rs +++ b/arrow/src/array/builder.rs @@ -3050,28 +3050,8 @@ mod tests { .add_buffer(Buffer::from_slice_ref(&[1, 2, 0, 4])) .build(); - assert_eq!(&expected_string_data, arr.column(0).data()); - - // TODO: implement equality for ArrayData - assert_eq!(expected_int_data.len(), arr.column(1).data().len()); - assert_eq!( - expected_int_data.null_count(), - arr.column(1).data().null_count() - ); - assert_eq!( - expected_int_data.null_bitmap(), - arr.column(1).data().null_bitmap() - ); - let expected_value_buf = expected_int_data.buffers()[0].clone(); - let actual_value_buf = arr.column(1).data().buffers()[0].clone(); - for i in 0..expected_int_data.len() { - if !expected_int_data.is_null(i) { - assert_eq!( - expected_value_buf.as_slice()[i * 4..(i + 1) * 4], - actual_value_buf.as_slice()[i * 4..(i + 1) * 4] - ); - } - } + assert_eq!(expected_string_data, *arr.column(0).data()); + assert_eq!(expected_int_data, *arr.column(1).data()); } #[test]