fix tests

Author: xudong963

src/query/service/src/pipelines/processors/transforms/hash_join/desc.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 use std::collections::HashMap;
-use std::collections::HashSet;
 
 use common_exception::Result;
 use common_functions::scalars::FunctionFactory;
@@ -29,15 +28,15 @@ use crate::sql::plans::JoinType;
 
 pub struct RightJoinDesc {
     /// Record rows in build side that are matched with rows in probe side.
-    pub(crate) build_indexes: RwLock<HashSet<RowPtr>>,
+    pub(crate) build_indexes: RwLock<Vec<RowPtr>>,
     /// Record row in build side that is matched how many rows in probe side.
     pub(crate) row_state: RwLock<HashMap<RowPtr, usize>>,
 }
 
 impl RightJoinDesc {
     pub fn create() -> Self {
         RightJoinDesc {
-            build_indexes: RwLock::new(HashSet::new()),
+            build_indexes: RwLock::new(Vec::new()),
             row_state: RwLock::new(HashMap::new()),
         }
     }

src/query/service/src/pipelines/processors/transforms/hash_join/join_hash_table.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::borrow::BorrowMut;
+use std::collections::HashSet;
 use std::fmt::Debug;
 use std::sync::Arc;
 use std::sync::Mutex;
@@ -437,30 +438,24 @@ impl JoinHashTable {
         // For right join, build side will appear at lease once in the joined table
         // Find the unmatched rows in build side
         let mut unmatched_build_indexes = vec![];
-        {
-            let chunks = self.row_space.chunks.read().unwrap();
-            for (chunk_index, chunk) in chunks.iter().enumerate() {
-                for row_index in 0..chunk.num_rows() {
-                    let row_ptr = RowPtr {
-                        chunk_index: chunk_index as u32,
-                        row_index: row_index as u32,
-                        marker: None,
-                    };
-                    if !self
-                        .hash_join_desc
-                        .right_join_desc
-                        .build_indexes
-                        .read()
-                        .contains(&row_ptr)
-                    {
-                        let mut row_state = self.hash_join_desc.right_join_desc.row_state.write();
-                        row_state.entry(row_ptr).or_insert(0_usize);
-                        unmatched_build_indexes.push(row_ptr);
-                    }
+        let build_indexes = self.hash_join_desc.right_join_desc.build_indexes.read();
+        let build_indexes_set: HashSet<&RowPtr> = build_indexes.iter().collect();
+        let chunks = self.row_space.chunks.read().unwrap();
+        for (chunk_index, chunk) in chunks.iter().enumerate() {
+            for row_index in 0..chunk.num_rows() {
+                let row_ptr = RowPtr {
+                    chunk_index: chunk_index as u32,
+                    row_index: row_index as u32,
+                    marker: None,
+                };
+                if !build_indexes_set.contains(&row_ptr) {
+                    let mut row_state = self.hash_join_desc.right_join_desc.row_state.write();
+                    row_state.entry(row_ptr).or_insert(0_usize);
+                    unmatched_build_indexes.push(row_ptr);
                 }
             }
-            drop(chunks);
         }
+        drop(chunks);
         Ok(unmatched_build_indexes)
     }
 }

src/query/service/src/pipelines/processors/transforms/hash_join/result_blocks.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::HashSet;
 use std::iter::TrustedLen;
 
 use common_arrow::arrow::bitmap::Bitmap;
@@ -656,7 +655,7 @@ impl JoinHashTable {
 
     pub(crate) fn filter_rows_for_right_join(
         bm: &mut MutableBitmap,
-        build_indexes: &HashSet<RowPtr>,
+        build_indexes: &Vec<RowPtr>,
         row_state: &mut std::collections::HashMap<RowPtr, usize>,
     ) {
         for (index, row) in build_indexes.iter().enumerate() {