@@ -9,7 +9,7 @@ use vortex_scalar::Scalar;
99use crate :: arrays:: { FixedSizeListArray , PrimitiveArray , StructArray } ;
1010use crate :: builders:: { ArrayBuilder , ArrayBuilderExt , ListBuilder } ;
1111use crate :: validity:: Validity ;
12- use crate :: { Array , IntoArray } ;
12+ use crate :: { Array , IntoArray , ToCanonical } ;
1313
1414////////////////////////////////////////////////////////////////////////////////////////////////////
1515// FSL of FSL tests
@@ -64,6 +64,61 @@ fn test_fsl_of_fsl_basic() {
6464 // We can check by slicing and examining scalars.
6565 let first_scalar = outer_fsl. scalar_at ( 0 ) ;
6666 assert ! ( !first_scalar. is_null( ) ) ;
67+
68+ // Check the actual values in the nested structure.
69+ // First outer list contains: [[1,2], [3,4], [5,6]].
70+ let first_outer_list = outer_fsl. fixed_size_list_at ( 0 ) ;
71+
72+ // Check first inner list [1,2].
73+ let inner_list_0 = first_outer_list
74+ . to_fixed_size_list ( )
75+ . unwrap ( )
76+ . fixed_size_list_at ( 0 ) ;
77+ assert_eq ! ( inner_list_0. scalar_at( 0 ) , 1i32 . into( ) ) ;
78+ assert_eq ! ( inner_list_0. scalar_at( 1 ) , 2i32 . into( ) ) ;
79+
80+ // Check second inner list [3,4].
81+ let inner_list_1 = first_outer_list
82+ . to_fixed_size_list ( )
83+ . unwrap ( )
84+ . fixed_size_list_at ( 1 ) ;
85+ assert_eq ! ( inner_list_1. scalar_at( 0 ) , 3i32 . into( ) ) ;
86+ assert_eq ! ( inner_list_1. scalar_at( 1 ) , 4i32 . into( ) ) ;
87+
88+ // Check third inner list [5,6].
89+ let inner_list_2 = first_outer_list
90+ . to_fixed_size_list ( )
91+ . unwrap ( )
92+ . fixed_size_list_at ( 2 ) ;
93+ assert_eq ! ( inner_list_2. scalar_at( 0 ) , 5i32 . into( ) ) ;
94+ assert_eq ! ( inner_list_2. scalar_at( 1 ) , 6i32 . into( ) ) ;
95+
96+ // Second outer list contains: [[7,8], [9,10], [11,12]].
97+ let second_outer_list = outer_fsl. fixed_size_list_at ( 1 ) ;
98+
99+ // Check first inner list [7,8].
100+ let inner_list_0 = second_outer_list
101+ . to_fixed_size_list ( )
102+ . unwrap ( )
103+ . fixed_size_list_at ( 0 ) ;
104+ assert_eq ! ( inner_list_0. scalar_at( 0 ) , 7i32 . into( ) ) ;
105+ assert_eq ! ( inner_list_0. scalar_at( 1 ) , 8i32 . into( ) ) ;
106+
107+ // Check second inner list [9,10].
108+ let inner_list_1 = second_outer_list
109+ . to_fixed_size_list ( )
110+ . unwrap ( )
111+ . fixed_size_list_at ( 1 ) ;
112+ assert_eq ! ( inner_list_1. scalar_at( 0 ) , 9i32 . into( ) ) ;
113+ assert_eq ! ( inner_list_1. scalar_at( 1 ) , 10i32 . into( ) ) ;
114+
115+ // Check third inner list [11,12].
116+ let inner_list_2 = second_outer_list
117+ . to_fixed_size_list ( )
118+ . unwrap ( )
119+ . fixed_size_list_at ( 2 ) ;
120+ assert_eq ! ( inner_list_2. scalar_at( 0 ) , 11i32 . into( ) ) ;
121+ assert_eq ! ( inner_list_2. scalar_at( 1 ) , 12i32 . into( ) ) ;
67122}
68123
69124#[ test]
@@ -153,6 +208,36 @@ fn test_deeply_nested_fsl() {
153208 )
154209 )
155210 ) ) ;
211+
212+ // Check the actual deeply nested values.
213+ // Structure: [[[1,2],[3,4]],[[5,6],[7,8]]].
214+ let top_level = level3. fixed_size_list_at ( 0 ) ;
215+ let level2_0 = top_level
216+ . to_fixed_size_list ( )
217+ . unwrap ( )
218+ . fixed_size_list_at ( 0 ) ;
219+ let level2_1 = top_level
220+ . to_fixed_size_list ( )
221+ . unwrap ( )
222+ . fixed_size_list_at ( 1 ) ;
223+
224+ // First level-2 list: [[1,2],[3,4]].
225+ let level1_0_0 = level2_0. to_fixed_size_list ( ) . unwrap ( ) . fixed_size_list_at ( 0 ) ;
226+ assert_eq ! ( level1_0_0. scalar_at( 0 ) , 1i32 . into( ) ) ;
227+ assert_eq ! ( level1_0_0. scalar_at( 1 ) , 2i32 . into( ) ) ;
228+
229+ let level1_0_1 = level2_0. to_fixed_size_list ( ) . unwrap ( ) . fixed_size_list_at ( 1 ) ;
230+ assert_eq ! ( level1_0_1. scalar_at( 0 ) , 3i32 . into( ) ) ;
231+ assert_eq ! ( level1_0_1. scalar_at( 1 ) , 4i32 . into( ) ) ;
232+
233+ // Second level-2 list: [[5,6],[7,8]].
234+ let level1_1_0 = level2_1. to_fixed_size_list ( ) . unwrap ( ) . fixed_size_list_at ( 0 ) ;
235+ assert_eq ! ( level1_1_0. scalar_at( 0 ) , 5i32 . into( ) ) ;
236+ assert_eq ! ( level1_1_0. scalar_at( 1 ) , 6i32 . into( ) ) ;
237+
238+ let level1_1_1 = level2_1. to_fixed_size_list ( ) . unwrap ( ) . fixed_size_list_at ( 1 ) ;
239+ assert_eq ! ( level1_1_1. scalar_at( 0 ) , 7i32 . into( ) ) ;
240+ assert_eq ! ( level1_1_1. scalar_at( 1 ) , 8i32 . into( ) ) ;
156241}
157242
158243////////////////////////////////////////////////////////////////////////////////////////////////////
0 commit comments