@@ -11,7 +11,6 @@ use itertools::Itertools;
1111use vortex_error:: VortexError ;
1212use vortex_error:: VortexResult ;
1313use vortex_error:: vortex_bail;
14- use vortex_error:: vortex_ensure;
1514use vortex_error:: vortex_err;
1615use vortex_flatbuffers:: FlatBuffer ;
1716use vortex_flatbuffers:: FlatBufferRoot ;
@@ -22,7 +21,6 @@ use vortex_session::VortexSession;
2221use crate :: dtype:: DType ;
2322use crate :: dtype:: DecimalDType ;
2423use crate :: dtype:: FieldDType ;
25- use crate :: dtype:: Nullability ;
2624use crate :: dtype:: PType ;
2725use crate :: dtype:: StructFields ;
2826use crate :: dtype:: UnionVariants ;
@@ -236,16 +234,6 @@ impl TryFrom<ViewedDType> for DType {
236234 . ok_or_else ( || vortex_err ! ( "failed to parse union from flatbuffer" ) ) ?;
237235 let variants =
238236 UnionVariants :: from_fb ( fb_union, vfdt. buffer ( ) . clone ( ) , vfdt. session . clone ( ) ) ?;
239-
240- let serialized_nullability: Nullability = fb_union. nullable ( ) . into ( ) ;
241- let derived_nullability = variants. derived_nullability ( ) ;
242- vortex_ensure ! (
243- serialized_nullability == derived_nullability,
244- "Serialized Union nullability does not match its variants: serialized={:?}, derived={:?}" ,
245- serialized_nullability,
246- derived_nullability
247- ) ;
248-
249237 Ok ( Self :: Union ( variants) )
250238 }
251239 fb:: Type :: Variant => {
@@ -414,7 +402,6 @@ impl WriteFlatBuffer for DType {
414402 names,
415403 dtypes,
416404 type_ids,
417- nullable : uv. derived_nullability ( ) . into ( ) ,
418405 } ,
419406 )
420407 . as_union_value ( )
@@ -594,7 +581,7 @@ mod test {
594581 }
595582
596583 #[ test]
597- fn test_union_round_trip_flatbuffer_with_nullability ( ) {
584+ fn test_union_round_trip_flatbuffer_with_nullable_variant ( ) {
598585 let dtype = DType :: Union (
599586 UnionVariants :: new (
600587 [ "null_variant" , "str" ] . into ( ) ,
@@ -605,53 +592,6 @@ mod test {
605592 roundtrip_dtype ( dtype) ;
606593 }
607594
608- #[ test]
609- fn test_union_flatbuffer_rejects_mismatched_serialized_nullability ( ) {
610- use flatbuffers:: FlatBufferBuilder ;
611- use vortex_buffer:: ByteBuffer ;
612- use vortex_flatbuffers:: WriteFlatBuffer ;
613-
614- let mut fbb = FlatBufferBuilder :: new ( ) ;
615- let name = fbb. create_string ( "value" ) ;
616- let names = fbb. create_vector ( & [ name] ) ;
617- let child = DType :: Utf8 ( Nullability :: Nullable )
618- . write_flatbuffer ( & mut fbb)
619- . unwrap ( ) ;
620- let dtypes = fbb. create_vector ( & [ child] ) ;
621- let type_ids = fbb. create_vector :: < i8 > ( & [ 0 ] ) ;
622- let union_table = fb:: Union :: create (
623- & mut fbb,
624- & fb:: UnionArgs {
625- names : Some ( names) ,
626- dtypes : Some ( dtypes) ,
627- type_ids : Some ( type_ids) ,
628- nullable : false ,
629- } ,
630- ) ;
631- let dtype = fb:: DType :: create (
632- & mut fbb,
633- & fb:: DTypeArgs {
634- type_type : fb:: Type :: Union ,
635- type_ : Some ( union_table. as_union_value ( ) ) ,
636- } ,
637- ) ;
638- fbb. finish_minimal ( dtype) ;
639- let ( vec, start) = fbb. collapse ( ) ;
640- let end = vec. len ( ) ;
641- let buffer = FlatBuffer :: align_from ( ByteBuffer :: from ( vec) . slice ( start..end) ) ;
642- let root_fb = root :: < fb:: DType > ( & buffer) . unwrap ( ) ;
643- let view = ViewedDType :: from_fb_loc ( root_fb. _tab . loc ( ) , buffer, SESSION . clone ( ) ) ;
644-
645- let result = DType :: try_from ( view) ;
646- assert ! ( result. is_err( ) ) ;
647- assert ! (
648- result
649- . unwrap_err( )
650- . to_string( )
651- . contains( "Serialized Union nullability does not match its variants" )
652- ) ;
653- }
654-
655595 #[ test]
656596 fn test_union_round_trip_flatbuffer_with_type_id_indirection ( ) {
657597 let dtype = DType :: Union (
@@ -755,7 +695,6 @@ mod test {
755695 names : Some ( names) ,
756696 dtypes : Some ( dtypes) ,
757697 type_ids : Some ( type_ids) ,
758- nullable : false ,
759698 } ,
760699 ) ;
761700
0 commit comments