@@ -642,8 +642,7 @@ impl BufferIdMap {
642642 }
643643
644644 // Promote to overflow.
645- let mut overflow =
646- hashbrown:: HashMap :: with_capacity ( INLINE_BUFFER_IDS + 1 ) ;
645+ let mut overflow = hashbrown:: HashMap :: with_capacity ( INLINE_BUFFER_IDS + 1 ) ;
647646 for i in 0 ..self . len {
648647 overflow. insert ( self . inline [ i] . 0 , self . inline [ i] . 1 ) ;
649648 }
@@ -689,6 +688,7 @@ impl BufferIdMap {
689688 /// Insert-only compatibility used by tests. Returns `true` if the buffer
690689 /// was newly inserted.
691690 #[ cfg( test) ]
691+ #[ expect( dead_code) ]
692692 fn insert ( & mut self , buffer_id : NonZero < usize > ) -> bool {
693693 self . increment ( buffer_id)
694694 }
@@ -1315,13 +1315,9 @@ mod record_batch_tests {
13151315 fn test_uncount_two_slices_example_from_issue ( ) {
13161316 // The exact example from the issue description.
13171317 let array = Int32Array :: from ( vec ! [ 0 ; 1_000_000 ] ) ; // 4 MB
1318- let schema = Arc :: new ( Schema :: new ( vec ! [ Field :: new(
1319- "col" ,
1320- DataType :: Int32 ,
1321- false ,
1322- ) ] ) ) ;
1323- let batch =
1324- RecordBatch :: try_new ( schema, vec ! [ Arc :: new( array) ] ) . unwrap ( ) ;
1318+ let schema =
1319+ Arc :: new ( Schema :: new ( vec ! [ Field :: new( "col" , DataType :: Int32 , false ) ] ) ) ;
1320+ let batch = RecordBatch :: try_new ( schema, vec ! [ Arc :: new( array) ] ) . unwrap ( ) ;
13251321 let slice1 = batch. slice ( 0 , 500_000 ) ;
13261322 let slice2 = batch. slice ( 500_000 , 500_000 ) ;
13271323
@@ -1608,12 +1604,12 @@ mod record_batch_tests {
16081604 counter. uncount_array ( array) ;
16091605 array_live_counts[ idx] -= 1 ;
16101606 for ( addr, cap) in & buffers {
1611- if let Some ( entry) = ref_map. get_mut ( addr) {
1612- if entry. 0 > 0 {
1613- entry . 0 -= 1 ;
1614- if entry. 0 == 0 {
1615- ref_memory -= cap ;
1616- }
1607+ if let Some ( entry) = ref_map. get_mut ( addr)
1608+ && entry. 0 > 0
1609+ {
1610+ entry. 0 -= 1 ;
1611+ if entry . 0 == 0 {
1612+ ref_memory -= cap ;
16171613 }
16181614 }
16191615 }
@@ -1632,7 +1628,11 @@ mod record_batch_tests {
16321628 counter. uncount_array ( * array) ;
16331629 }
16341630 }
1635- assert_eq ! ( counter. memory_usage( ) , 0 , "Memory not zero after full drain" ) ;
1631+ assert_eq ! (
1632+ counter. memory_usage( ) ,
1633+ 0 ,
1634+ "Memory not zero after full drain"
1635+ ) ;
16361636 }
16371637
16381638 // ---------------------------------------------------------------
@@ -1658,7 +1658,10 @@ mod record_batch_tests {
16581658
16591659 let mut counter = RecordBatchMemoryCounter :: new ( ) ;
16601660 let counted1 = counter. count_array ( & slice1) ;
1661- assert_eq ! ( counted1, full_size, "First slice should count all shared data buffers" ) ;
1661+ assert_eq ! (
1662+ counted1, full_size,
1663+ "First slice should count all shared data buffers"
1664+ ) ;
16621665
16631666 let counted2 = counter. count_array ( & slice2) ;
16641667 assert_eq ! ( counted2, 0 , "Second slice shares all buffers with first" ) ;
@@ -1727,7 +1730,10 @@ mod record_batch_tests {
17271730 let mut counter = RecordBatchMemoryCounter :: new ( ) ;
17281731 let counted1 = counter. count_array ( & list1) ;
17291732 let counted2 = counter. count_array ( & list2) ;
1730- assert ! ( counted2 < counted1, "list2 shares child buffer, should add less" ) ;
1733+ assert ! (
1734+ counted2 < counted1,
1735+ "list2 shares child buffer, should add less"
1736+ ) ;
17311737
17321738 let total = counter. memory_usage ( ) ;
17331739 let released1 = counter. uncount_array ( & list1) ;
@@ -1949,7 +1955,8 @@ mod record_batch_tests {
19491955
19501956 #[ test]
19511957 fn test_uncount_large_utf8_array ( ) {
1952- let array = arrow:: array:: LargeStringArray :: from ( vec ! [ "alpha" , "bravo" , "charlie" ] ) ;
1958+ let array =
1959+ arrow:: array:: LargeStringArray :: from ( vec ! [ "alpha" , "bravo" , "charlie" ] ) ;
19531960
19541961 let mut counter = RecordBatchMemoryCounter :: new ( ) ;
19551962 let counted = counter. count_array ( & array) ;
@@ -1994,12 +2001,7 @@ mod record_batch_tests {
19942001 #[ test]
19952002 fn test_uncount_fixed_size_binary ( ) {
19962003 let array = arrow:: array:: FixedSizeBinaryArray :: try_from_iter (
1997- vec ! [
1998- vec![ 1u8 , 2 , 3 , 4 ] ,
1999- vec![ 5 , 6 , 7 , 8 ] ,
2000- vec![ 9 , 10 , 11 , 12 ] ,
2001- ]
2002- . into_iter ( ) ,
2004+ vec ! [ vec![ 1u8 , 2 , 3 , 4 ] , vec![ 5 , 6 , 7 , 8 ] , vec![ 9 , 10 , 11 , 12 ] ] . into_iter ( ) ,
20032005 )
20042006 . unwrap ( ) ;
20052007
@@ -2016,7 +2018,8 @@ mod record_batch_tests {
20162018 fn test_uncount_fixed_size_list ( ) {
20172019 let values = Int32Array :: from ( vec ! [ 1 , 2 , 3 , 4 , 5 , 6 ] ) ;
20182020 let field = Arc :: new ( Field :: new ( "item" , DataType :: Int32 , false ) ) ;
2019- let array = arrow:: array:: FixedSizeListArray :: new ( field, 3 , Arc :: new ( values) , None ) ;
2021+ let array =
2022+ arrow:: array:: FixedSizeListArray :: new ( field, 3 , Arc :: new ( values) , None ) ;
20202023
20212024 let mut counter = RecordBatchMemoryCounter :: new ( ) ;
20222025 let counted = counter. count_array ( & array) ;
@@ -2037,18 +2040,14 @@ mod record_batch_tests {
20372040 // counted once and released correctly.
20382041 let shared_col: ArrayRef = Arc :: new ( Int32Array :: from ( vec ! [ 1 , 2 , 3 , 4 , 5 , 6 ] ) ) ;
20392042 let schema = Arc :: new ( Schema :: new ( vec ! [ Field :: new( "v" , DataType :: Int32 , false ) ] ) ) ;
2040- let batch1 = RecordBatch :: try_new (
2041- Arc :: clone ( & schema) ,
2042- vec ! [ Arc :: clone( & shared_col) ] ,
2043- )
2044- . unwrap ( )
2045- . slice ( 0 , 3 ) ;
2046- let batch2 = RecordBatch :: try_new (
2047- Arc :: clone ( & schema) ,
2048- vec ! [ Arc :: clone( & shared_col) ] ,
2049- )
2050- . unwrap ( )
2051- . slice ( 3 , 3 ) ;
2043+ let batch1 =
2044+ RecordBatch :: try_new ( Arc :: clone ( & schema) , vec ! [ Arc :: clone( & shared_col) ] )
2045+ . unwrap ( )
2046+ . slice ( 0 , 3 ) ;
2047+ let batch2 =
2048+ RecordBatch :: try_new ( Arc :: clone ( & schema) , vec ! [ Arc :: clone( & shared_col) ] )
2049+ . unwrap ( )
2050+ . slice ( 3 , 3 ) ;
20522051
20532052 let mut counter = RecordBatchMemoryCounter :: new ( ) ;
20542053 let counted1 = counter. count_batch_with_array_overhead ( & batch1) ;
@@ -2101,19 +2100,16 @@ mod record_batch_tests {
21012100 . unwrap ( ) ,
21022101 ) as ArrayRef ;
21032102
2104- let struct_fields =
2105- Fields :: from ( vec ! [ Arc :: new( Field :: new(
2106- "d" ,
2107- DataType :: Dictionary ( Box :: new( DataType :: Int32 ) , Box :: new( DataType :: Utf8 ) ) ,
2108- false ,
2109- ) ) ] ) ;
2110- let struct_array = StructArray :: new ( struct_fields. clone ( ) , vec ! [ dict_array] , None ) ;
2111-
2112- let list_field = Arc :: new ( Field :: new (
2113- "item" ,
2114- DataType :: Struct ( struct_fields) ,
2103+ let struct_fields = Fields :: from ( vec ! [ Arc :: new( Field :: new(
2104+ "d" ,
2105+ DataType :: Dictionary ( Box :: new( DataType :: Int32 ) , Box :: new( DataType :: Utf8 ) ) ,
21152106 false ,
2116- ) ) ;
2107+ ) ) ] ) ;
2108+ let struct_array =
2109+ StructArray :: new ( struct_fields. clone ( ) , vec ! [ dict_array] , None ) ;
2110+
2111+ let list_field =
2112+ Arc :: new ( Field :: new ( "item" , DataType :: Struct ( struct_fields) , false ) ) ;
21172113 let list_array = ListArray :: new (
21182114 list_field,
21192115 OffsetBuffer :: new ( vec ! [ 0 , 3 ] . into ( ) ) ,
0 commit comments