port next test

Author: alamb

parquet/src/arrow/arrow_reader/selection.rs

@@ -1624,17 +1624,35 @@ mod tests {
 
     #[test]
     #[should_panic(expected = "selection exceeds the number of selected rows")]
-    fn test_and_longer() {
-        let a = RowSelectorSelection::from(vec![
-            RowSelector::select(3),
-            RowSelector::skip(33),
-            RowSelector::select(3),
-            RowSelector::skip(33),
-        ]);
-        let b = RowSelectorSelection::from(vec![RowSelector::select(36)]);
+    fn test_and_longer_selectors() {
+        let (a, b) = longer_selectors();
+        let a = force_selectors(a);
+        let b = force_selectors(b);
         a.and_then(&b);
     }
 
+    #[test]
+    #[should_panic(expected = "The 'other' selection must have exactly as many set bits as 'self'")]
+    fn test_and_longer_mask() {
+        let (a, b) = longer_selectors();
+        let a = force_mask(a);
+        let b = force_mask(b);
+        a.and_then(&b);
+    }
+
+    /// Returns two RowSelections where the first is longer than the second
+    fn longer_selectors() -> (RowSelection, RowSelection) {
+        (
+            RowSelection::from(vec![
+                RowSelector::select(3),
+                RowSelector::skip(33),
+                RowSelector::select(3),
+                RowSelector::skip(33),
+            ]),
+            RowSelection::from(vec![RowSelector::select(36)]),
+        )
+    }
+
     #[test]
     #[should_panic(expected = "selection contains less than the number of selected rows")]
     fn test_and_shorter() {

parquet/src/arrow/arrow_reader/selection/and_then.rs

@@ -19,8 +19,8 @@
 //! Xiangpeng Hao in <https://github.com/apache/arrow-rs/pull/6624> and
 //! [LiquidCache's implementation](https://github.com/XiangpengHao/liquid-cache/blob/60323cdb5f17f88af633ad9acbc7d74f684f9912/src/parquet/src/utils.rs#L17)
 
-use arrow_buffer::{BooleanBuffer, BooleanBufferBuilder, MutableBuffer};
 use arrow_buffer::bit_util::{apply_bitwise_binary_op, apply_bitwise_unary_op};
+use arrow_buffer::{BooleanBuffer, BooleanBufferBuilder, MutableBuffer};
 
 fn boolean_buffer_and_then_fallback(left: &BooleanBuffer, right: &BooleanBuffer) -> BooleanBuffer {
     debug_assert_eq!(

parquet/src/arrow/arrow_reader/selection/mask.rs

@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::fmt::Debug;
 use crate::arrow::arrow_reader::RowSelector;
 use crate::arrow::arrow_reader::selection::and_then::boolean_buffer_and_then;
 use crate::arrow::arrow_reader::selection::conversion::{
@@ -24,6 +23,7 @@ use crate::arrow::arrow_reader::selection::conversion::{
 use arrow_array::{Array, BooleanArray};
 use arrow_buffer::bit_iterator::{BitIndexIterator, BitSliceIterator};
 use arrow_buffer::{BooleanBuffer, BooleanBufferBuilder};
+use std::fmt::Debug;
 use std::ops::Range;
 
 /// [`RowSelection`] based on a [`BooleanArray`]