[arrow-rs] branch master updated: Fix the behavior of `from_fixed_size_list` when offset > 0 (#1964)

[tustvold]

This is an automated email from the ASF dual-hosted git repository.

tustvold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git


The following commit(s) were added to refs/heads/master by this push:
     new 8bb494ef1 Fix the behavior of `from_fixed_size_list` when offset > 0 
(#1964)
8bb494ef1 is described below

commit 8bb494ef16a10b9064cf58aef93eb8250b80123a
Author: Remzi Yang <59198230+haoyang...@users.noreply.github.com>
AuthorDate: Thu Jun 30 01:27:22 2022 +0800

    Fix the behavior of `from_fixed_size_list` when offset > 0 (#1964)
    
    * fix the behaviour of from_fixed_size_list when offset > 0
    
    Signed-off-by: remzi <1371656737...@gmail.com>
    
    * Update arrow/src/array/array_binary.rs
    
    Co-authored-by: Raphael Taylor-Davies 
<1781103+tustv...@users.noreply.github.com>
    
    Co-authored-by: Raphael Taylor-Davies 
<1781103+tustv...@users.noreply.github.com>
---
 arrow/src/array/array_binary.rs | 43 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/arrow/src/array/array_binary.rs b/arrow/src/array/array_binary.rs
index 6d7856475..cbc6653c7 100644
--- a/arrow/src/array/array_binary.rs
+++ b/arrow/src/array/array_binary.rs
@@ -831,22 +831,26 @@ impl DecimalArray {
         precision: usize,
         scale: usize,
     ) -> Self {
+        let child_data = &v.data_ref().child_data()[0];
         assert_eq!(
-            v.data_ref().child_data()[0].child_data().len(),
+            child_data.child_data().len(),
             0,
             "DecimalArray can only be created from list array of u8 values \
              (i.e. FixedSizeList<PrimitiveArray<u8>>)."
         );
         assert_eq!(
-            v.data_ref().child_data()[0].data_type(),
+            child_data.data_type(),
             &DataType::UInt8,
             "DecimalArray can only be created from FixedSizeList<u8> arrays, 
mismatched data types."
         );
 
+        let list_offset = v.offset();
+        let child_offset = child_data.offset();
         let builder = ArrayData::builder(DataType::Decimal(precision, scale))
             .len(v.len())
-            .add_buffer(v.data_ref().child_data()[0].buffers()[0].clone())
-            .null_bit_buffer(v.data_ref().null_buffer().cloned());
+            .add_buffer(child_data.buffers()[0].slice(child_offset))
+            .null_bit_buffer(v.data_ref().null_buffer().cloned())
+            .offset(list_offset);
 
         let array_data = unsafe { builder.build_unchecked() };
         Self::from(array_data)
@@ -1677,6 +1681,37 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_decimal_array_from_fixed_size_list() {
+        let value_data = ArrayData::builder(DataType::UInt8)
+            .offset(16)
+            .len(48)
+            .add_buffer(Buffer::from_slice_ref(&[99999_i128, 12, 34, 56]))
+            .build()
+            .unwrap();
+
+        let null_buffer = Buffer::from_slice_ref(&[0b101]);
+
+        // Construct a list array from the above two
+        let list_data_type = DataType::FixedSizeList(
+            Box::new(Field::new("item", DataType::UInt8, false)),
+            16,
+        );
+        let list_data = ArrayData::builder(list_data_type)
+            .len(2)
+            .null_bit_buffer(Some(null_buffer))
+            .offset(1)
+            .add_child_data(value_data)
+            .build()
+            .unwrap();
+        let list_array = FixedSizeListArray::from(list_data);
+        let decimal = DecimalArray::from_fixed_size_list_array(list_array, 38, 
0);
+
+        assert_eq!(decimal.len(), 2);
+        assert!(decimal.is_null(0));
+        assert_eq!(decimal.value_as_string(1), "56".to_string());
+    }
+
     #[test]
     fn test_fixed_size_binary_array_from_iter() {
         let input_arg = vec![vec![1, 2], vec![3, 4], vec![5, 6]];