fix conflicts

databendlabs · Jul 3, 2022 · 0e2de3f · 0e2de3f
1 parent 6223fc7
commit 0e2de3f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/query/src/pipelines/new/processors/transforms/hash_join/join_hash_table.rs b/query/src/pipelines/new/processors/transforms/hash_join/join_hash_table.rs
@@ -458,14 +458,6 @@ impl HashJoinState for JoinHashTable {
             }
             JoinType::Cross => self.probe_cross_join(input, probe_state),
             _ => unimplemented!("{} is unimplemented", self.join_type),
-        }?;
-        if self.other_predicate.is_none()
-            || self.join_type == JoinType::Anti
-            || self.join_type == JoinType::Semi
-            || self.join_type == JoinType::Left
-            || self.join_type == JoinType::Mark
-        {
-            return Ok(data_blocks);
         }
     }
 

diff --git a/query/src/pipelines/new/processors/transforms/hash_join/result_blocks.rs b/query/src/pipelines/new/processors/transforms/hash_join/result_blocks.rs
@@ -32,7 +32,7 @@ use super::ProbeState;
 use crate::common::EvalNode;
 use crate::common::HashMap;
 use crate::common::HashTableKeyable;
-use crate::pipelines::new::processors::transforms::hash_join::chaining_hash_table::MarkerKind;
+use crate::pipelines::new::processors::transforms::hash_join::join_hash_table::MarkerKind;
 use crate::pipelines::new::processors::transforms::hash_join::row::RowPtr;
 use crate::sql::exec::ColumnID;
 use crate::sql::planner::plans::JoinType;