@@ -33,8 +33,8 @@ fn test_execution_ctx() -> ExecutionCtx {
3333fn full_density_no_overlap ( ) -> VortexResult < ( ) > {
3434 let mut ctx = test_execution_ctx ( ) ;
3535 let lv = create_basic_listview ( ) ;
36- let exact = lv. compute_density ( & mut ctx) ?. expect ( "non-empty elements" ) ;
37- let est = lv. estimate_density ( & mut ctx) ?. expect ( "non-empty elements" ) ;
36+ let exact = lv. compute_density ( & mut ctx) ?;
37+ let est = lv. estimate_density ( & mut ctx) ?;
3838
3939 assert ! ( ( exact - 1.0 ) . abs( ) < EPS ) ;
4040 assert ! ( ( est - 1.0 ) . abs( ) < EPS ) ;
@@ -45,8 +45,8 @@ fn full_density_no_overlap() -> VortexResult<()> {
4545fn sparse_no_overlap_matches_exact ( ) -> VortexResult < ( ) > {
4646 let mut ctx = test_execution_ctx ( ) ;
4747 let lv = create_large_listview ( ) ;
48- let exact = lv. compute_density ( & mut ctx) ?. expect ( "non-empty" ) ;
49- let est = lv. estimate_density ( & mut ctx) ?. expect ( "non-empty" ) ;
48+ let exact = lv. compute_density ( & mut ctx) ?;
49+ let est = lv. estimate_density ( & mut ctx) ?;
5050
5151 assert ! ( ( exact - 0.5 ) . abs( ) < EPS ) ;
5252 assert ! ( ( est - 0.5 ) . abs( ) < EPS ) ;
@@ -57,12 +57,8 @@ fn sparse_no_overlap_matches_exact() -> VortexResult<()> {
5757fn all_empty_lists_is_zero_density ( ) -> VortexResult < ( ) > {
5858 let mut ctx = test_execution_ctx ( ) ;
5959 let lv = create_empty_lists_listview ( ) ;
60- let exact = lv
61- . compute_density ( & mut ctx) ?
62- . expect ( "elements has length 1" ) ;
63- let est = lv
64- . estimate_density ( & mut ctx) ?
65- . expect ( "elements has length 1" ) ;
60+ let exact = lv. compute_density ( & mut ctx) ?;
61+ let est = lv. estimate_density ( & mut ctx) ?;
6662
6763 assert_eq ! ( exact, 0.0 ) ;
6864 assert_eq ! ( est, 0.0 ) ;
@@ -73,8 +69,8 @@ fn all_empty_lists_is_zero_density() -> VortexResult<()> {
7369fn overlap_full_coverage_clamps_estimate ( ) -> VortexResult < ( ) > {
7470 let mut ctx = test_execution_ctx ( ) ;
7571 let lv = create_overlapping_listview ( ) ;
76- let exact = lv. compute_density ( & mut ctx) ?. expect ( "non-empty" ) ;
77- let est = lv. estimate_density ( & mut ctx) ?. expect ( "non-empty" ) ;
72+ let exact = lv. compute_density ( & mut ctx) ?;
73+ let est = lv. estimate_density ( & mut ctx) ?;
7874
7975 assert ! ( ( exact - 1.0 ) . abs( ) < EPS ) ;
8076 assert ! ( ( est - 1.0 ) . abs( ) < EPS ) ;
@@ -86,21 +82,24 @@ fn overlap_differential_exact_lower_than_estimate() -> VortexResult<()> {
8682 let mut ctx = test_execution_ctx ( ) ;
8783 let lv = create_sparse_overlapping_listview ( ) ;
8884
89- let exact = lv. compute_density ( & mut ctx) ?. expect ( "non-empty" ) ;
90- let est = lv. estimate_density ( & mut ctx) ?. expect ( "non-empty" ) ;
85+ let exact = lv. compute_density ( & mut ctx) ?;
86+ let est = lv. estimate_density ( & mut ctx) ?;
9187
9288 assert ! ( ( exact - 0.25 ) . abs( ) < EPS ) ;
9389 assert ! ( ( est - 0.40 ) . abs( ) < EPS ) ;
9490 Ok ( ( ) )
9591}
9692
9793#[ test]
98- fn empty_elements_returns_none ( ) -> VortexResult < ( ) > {
94+ fn empty_elements_returns_zero ( ) -> VortexResult < ( ) > {
9995 let mut ctx = test_execution_ctx ( ) ;
10096 let lv = create_empty_elements_listview ( ) ;
10197
102- assert ! ( lv. compute_density( & mut ctx) ?. is_none( ) ) ;
103- assert ! ( lv. estimate_density( & mut ctx) ?. is_none( ) ) ;
98+ let exact = lv. compute_density ( & mut ctx) ?;
99+ let est = lv. estimate_density ( & mut ctx) ?;
100+
101+ assert ! ( exact. abs( ) < EPS ) ;
102+ assert ! ( est. abs( ) < EPS ) ;
104103 Ok ( ( ) )
105104}
106105
@@ -114,7 +113,7 @@ fn estimate_uses_cached_sum_stat() -> VortexResult<()> {
114113 . statistics ( )
115114 . set ( Stat :: Sum , Precision :: Exact ( ScalarValue :: from ( 5u64 ) ) ) ;
116115
117- let est = lv. estimate_density ( & mut ctx) ?. expect ( "non-empty" ) ;
116+ let est = lv. estimate_density ( & mut ctx) ?;
118117 assert ! ( ( est - 0.5 ) . abs( ) < EPS ) ;
119118 Ok ( ( ) )
120119}
@@ -123,9 +122,7 @@ fn estimate_uses_cached_sum_stat() -> VortexResult<()> {
123122fn referenced_mask_set_bits_match_views ( ) -> VortexResult < ( ) > {
124123 let mut ctx = test_execution_ctx ( ) ;
125124 let lv = create_sparse_overlapping_listview ( ) ;
126- let mask = lv
127- . compute_referenced_elements_mask ( & mut ctx) ?
128- . expect ( "non-empty elements" ) ;
125+ let mask = lv. compute_referenced_elements_mask ( & mut ctx) ?;
129126 let bits = match mask {
130127 Mask :: Values ( v) => v,
131128 _ => panic ! ( "expected Values mask" ) ,
0 commit comments