@@ -6,22 +6,28 @@ use vortex_buffer::buffer;
66use vortex_error:: VortexExpect ;
77use vortex_error:: VortexResult ;
88
9+ use crate :: ArrayRef ;
910use crate :: EqMode ;
1011use crate :: IntoArray ;
1112use crate :: VortexSessionExecute ;
1213use crate :: array_session;
14+ use crate :: arrays:: BoolArray ;
1315use crate :: arrays:: PrimitiveArray ;
16+ use crate :: arrays:: StructArray ;
1417use crate :: arrays:: datetime:: TemporalData ;
1518use crate :: assert_arrays_eq;
19+ use crate :: builtins:: ArrayBuiltins ;
1620use crate :: expr:: gt;
1721use crate :: expr:: lit;
1822use crate :: expr:: root;
23+ use crate :: extension:: datetime:: Interval ;
1924use crate :: extension:: datetime:: TemporalMetadata ;
2025use crate :: extension:: datetime:: TimeUnit ;
2126use crate :: extension:: datetime:: Timestamp ;
2227use crate :: extension:: datetime:: TimestampOptions ;
2328use crate :: hash:: ArrayEq ;
2429use crate :: scalar:: Scalar ;
30+ use crate :: scalar_fn:: fns:: operators:: Operator ;
2531use crate :: validity:: Validity ;
2632
2733macro_rules! test_temporal_roundtrip {
@@ -35,7 +41,7 @@ macro_rules! test_temporal_roundtrip {
3541 PrimitiveArray :: from_iter( [ 100 as $prim] ) ,
3642 & mut ctx
3743 ) ;
38- assert_eq!( temporal. temporal_metadata( ) . time_unit( ) , $unit) ;
44+ assert_eq!( temporal. temporal_metadata( ) . time_unit( ) , Some ( $unit) ) ;
3945 } } ;
4046}
4147
@@ -170,6 +176,40 @@ test_fail_case!(
170176 TimeUnit :: Days
171177) ;
172178
179+ fn intervals ( values : & [ ( i32 , i32 , i64 ) ] ) -> VortexResult < ArrayRef > {
180+ let storage = StructArray :: try_new (
181+ Interval :: FIELD_NAMES . into ( ) ,
182+ [
183+ PrimitiveArray :: from_iter ( values. iter ( ) . map ( |v| v. 0 ) ) . into_array ( ) ,
184+ PrimitiveArray :: from_iter ( values. iter ( ) . map ( |v| v. 1 ) ) . into_array ( ) ,
185+ PrimitiveArray :: from_iter ( values. iter ( ) . map ( |v| v. 2 ) ) . into_array ( ) ,
186+ ] ,
187+ values. len ( ) ,
188+ Validity :: NonNullable ,
189+ ) ?;
190+ Ok ( TemporalData :: new_interval ( storage. into_array ( ) ) . into_array ( ) )
191+ }
192+
193+ #[ test]
194+ fn test_interval_compares_field_by_field ( ) -> VortexResult < ( ) > {
195+ let mut ctx = array_session ( ) . create_execution_ctx ( ) ;
196+ // 1 month against 100 days, 1 month against 30 days, and 1 day against 24 hours.
197+ let lhs = intervals ( & [ ( 1 , 0 , 0 ) , ( 1 , 0 , 0 ) , ( 0 , 1 , 0 ) ] ) ?;
198+ let rhs = intervals ( & [ ( 0 , 100 , 0 ) , ( 0 , 30 , 0 ) , ( 0 , 0 , 86_400_000_000_000 ) ] ) ?;
199+
200+ let gt = lhs. binary ( rhs. clone ( ) , Operator :: Gt ) ?;
201+ assert_arrays_eq ! ( gt, BoolArray :: from_iter( [ true , true , true ] ) , & mut ctx) ;
202+ let eq = lhs. binary ( rhs, Operator :: Eq ) ?;
203+ assert_arrays_eq ! ( eq, BoolArray :: from_iter( [ false , false , false ] ) , & mut ctx) ;
204+ Ok ( ( ) )
205+ }
206+
207+ #[ test]
208+ #[ should_panic]
209+ fn test_interval_fails_primitive ( ) {
210+ TemporalData :: new_interval ( buffer ! [ 100i64 ] . into_array ( ) ) ;
211+ }
212+
173213// We test Timestamp explicitly to avoid the macro getting too complex.
174214#[ test]
175215fn test_timestamp ( ) {
0 commit comments