@@ -277,7 +277,7 @@ mod tests {
277277 use std:: { collections:: HashMap , sync:: Arc } ;
278278
279279 use actix_web:: test:: TestRequest ;
280- use arrow_array:: { ArrayRef , Float64Array , Int64Array , StringArray } ;
280+ use arrow_array:: { ArrayRef , Float64Array , StringArray } ;
281281 use arrow_schema:: { DataType , Field } ;
282282 use serde_json:: json;
283283
@@ -287,16 +287,11 @@ mod tests {
287287 } ;
288288
289289 trait TestExt {
290- fn as_int64_arr ( & self ) -> & Int64Array ;
291290 fn as_float64_arr ( & self ) -> & Float64Array ;
292291 fn as_utf8_arr ( & self ) -> & StringArray ;
293292 }
294293
295294 impl TestExt for ArrayRef {
296- fn as_int64_arr ( & self ) -> & Int64Array {
297- self . as_any ( ) . downcast_ref ( ) . unwrap ( )
298- }
299-
300295 fn as_float64_arr ( & self ) -> & Float64Array {
301296 self . as_any ( ) . downcast_ref ( ) . unwrap ( )
302297 }
@@ -328,8 +323,8 @@ mod tests {
328323 assert_eq ! ( rb. num_rows( ) , 1 ) ;
329324 assert_eq ! ( rb. num_columns( ) , 6 ) ;
330325 assert_eq ! (
331- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
332- & Int64Array :: from_iter( [ 1 ] )
326+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
327+ & Float64Array :: from_iter( [ 1.0 ] )
333328 ) ;
334329 assert_eq ! (
335330 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -368,8 +363,8 @@ mod tests {
368363 assert_eq ! ( rb. num_rows( ) , 1 ) ;
369364 assert_eq ! ( rb. num_columns( ) , 5 ) ;
370365 assert_eq ! (
371- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
372- & Int64Array :: from_iter( [ 1 ] )
366+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
367+ & Float64Array :: from_iter( [ 1.0 ] )
373368 ) ;
374369 assert_eq ! (
375370 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -386,7 +381,7 @@ mod tests {
386381
387382 let schema = fields_to_map (
388383 [
389- Field :: new ( "a" , DataType :: Int64 , true ) ,
384+ Field :: new ( "a" , DataType :: Float64 , true ) ,
390385 Field :: new ( "b" , DataType :: Utf8 , true ) ,
391386 Field :: new ( "c" , DataType :: Float64 , true ) ,
392387 ]
@@ -400,8 +395,8 @@ mod tests {
400395 assert_eq ! ( rb. num_rows( ) , 1 ) ;
401396 assert_eq ! ( rb. num_columns( ) , 5 ) ;
402397 assert_eq ! (
403- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
404- & Int64Array :: from_iter( [ 1 ] )
398+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
399+ & Float64Array :: from_iter( [ 1.0 ] )
405400 ) ;
406401 assert_eq ! (
407402 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -418,7 +413,7 @@ mod tests {
418413
419414 let schema = fields_to_map (
420415 [
421- Field :: new ( "a" , DataType :: Int64 , true ) ,
416+ Field :: new ( "a" , DataType :: Float64 , true ) ,
422417 Field :: new ( "b" , DataType :: Utf8 , true ) ,
423418 Field :: new ( "c" , DataType :: Float64 , true ) ,
424419 ]
@@ -488,21 +483,21 @@ mod tests {
488483 let schema = rb. schema ( ) ;
489484 let fields = & schema. fields ;
490485
491- assert_eq ! ( & * fields[ 1 ] , & Field :: new( "a" , DataType :: Int64 , true ) ) ;
486+ assert_eq ! ( & * fields[ 1 ] , & Field :: new( "a" , DataType :: Float64 , true ) ) ;
492487 assert_eq ! ( & * fields[ 2 ] , & Field :: new( "b" , DataType :: Utf8 , true ) ) ;
493- assert_eq ! ( & * fields[ 3 ] , & Field :: new( "c" , DataType :: Int64 , true ) ) ;
488+ assert_eq ! ( & * fields[ 3 ] , & Field :: new( "c" , DataType :: Float64 , true ) ) ;
494489
495490 assert_eq ! (
496- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
497- & Int64Array :: from( vec![ None , Some ( 1 ) , Some ( 1 ) ] )
491+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
492+ & Float64Array :: from( vec![ None , Some ( 1.0 ) , Some ( 1.0 ) ] )
498493 ) ;
499494 assert_eq ! (
500495 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
501496 & StringArray :: from( vec![ Some ( "hello" ) , Some ( "hello" ) , Some ( "hello" ) , ] )
502497 ) ;
503498 assert_eq ! (
504- rb. column_by_name( "c" ) . unwrap( ) . as_int64_arr ( ) ,
505- & Int64Array :: from( vec![ None , Some ( 1 ) , None ] )
499+ rb. column_by_name( "c" ) . unwrap( ) . as_float64_arr ( ) ,
500+ & Float64Array :: from( vec![ None , Some ( 1.0 ) , None ] )
506501 ) ;
507502 }
508503
@@ -533,8 +528,8 @@ mod tests {
533528 assert_eq ! ( rb. num_rows( ) , 3 ) ;
534529 assert_eq ! ( rb. num_columns( ) , 6 ) ;
535530 assert_eq ! (
536- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
537- & Int64Array :: from( vec![ None , Some ( 1 ) , Some ( 1 ) ] )
531+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
532+ & Float64Array :: from( vec![ None , Some ( 1.0 ) , Some ( 1.0 ) ] )
538533 ) ;
539534 assert_eq ! (
540535 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -568,7 +563,7 @@ mod tests {
568563
569564 let schema = fields_to_map (
570565 [
571- Field :: new ( "a" , DataType :: Int64 , true ) ,
566+ Field :: new ( "a" , DataType :: Float64 , true ) ,
572567 Field :: new ( "b" , DataType :: Utf8 , true ) ,
573568 Field :: new ( "c" , DataType :: Float64 , true ) ,
574569 ]
@@ -581,8 +576,8 @@ mod tests {
581576 assert_eq ! ( rb. num_rows( ) , 3 ) ;
582577 assert_eq ! ( rb. num_columns( ) , 6 ) ;
583578 assert_eq ! (
584- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
585- & Int64Array :: from( vec![ None , Some ( 1 ) , Some ( 1 ) ] )
579+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
580+ & Float64Array :: from( vec![ None , Some ( 1.0 ) , Some ( 1.0 ) ] )
586581 ) ;
587582 assert_eq ! (
588583 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -608,7 +603,7 @@ mod tests {
608603 "c" : 1
609604 } ,
610605 {
611- "a" : 1 ,
606+ "a" : "1" ,
612607 "b" : "hello" ,
613608 "c" : null
614609 } ,
@@ -618,7 +613,7 @@ mod tests {
618613
619614 let schema = fields_to_map (
620615 [
621- Field :: new ( "a" , DataType :: Int64 , true ) ,
616+ Field :: new ( "a" , DataType :: Float64 , true ) ,
622617 Field :: new ( "b" , DataType :: Utf8 , true ) ,
623618 Field :: new ( "c" , DataType :: Float64 , true ) ,
624619 ]
@@ -658,8 +653,8 @@ mod tests {
658653 assert_eq ! ( rb. num_rows( ) , 4 ) ;
659654 assert_eq ! ( rb. num_columns( ) , 7 ) ;
660655 assert_eq ! (
661- rb. column_by_name( "a" ) . unwrap( ) . as_int64_arr ( ) ,
662- & Int64Array :: from( vec![ Some ( 1 ) , Some ( 1 ) , Some ( 1 ) , Some ( 1 ) ] )
656+ rb. column_by_name( "a" ) . unwrap( ) . as_float64_arr ( ) ,
657+ & Float64Array :: from( vec![ Some ( 1.0 ) , Some ( 1.0 ) , Some ( 1.0 ) , Some ( 1.0 ) ] )
663658 ) ;
664659 assert_eq ! (
665660 rb. column_by_name( "b" ) . unwrap( ) . as_utf8_arr( ) ,
@@ -672,13 +667,13 @@ mod tests {
672667 ) ;
673668
674669 assert_eq ! (
675- rb. column_by_name( "c_a" ) . unwrap( ) . as_int64_arr ( ) ,
676- & Int64Array :: from( vec![ None , None , Some ( 1 ) , Some ( 1 ) ] )
670+ rb. column_by_name( "c_a" ) . unwrap( ) . as_float64_arr ( ) ,
671+ & Float64Array :: from( vec![ None , None , Some ( 1.0 ) , Some ( 1.0 ) ] )
677672 ) ;
678673
679674 assert_eq ! (
680- rb. column_by_name( "c_b" ) . unwrap( ) . as_int64_arr ( ) ,
681- & Int64Array :: from( vec![ None , None , None , Some ( 2 ) ] )
675+ rb. column_by_name( "c_b" ) . unwrap( ) . as_float64_arr ( ) ,
676+ & Float64Array :: from( vec![ None , None , None , Some ( 2.0 ) ] )
682677 ) ;
683678 }
684679}
0 commit comments