resolve conflicts

databendlabs · Jul 5, 2022 · 03473c9 · 03473c9
1 parent 357b85b
commit 03473c9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
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
@@ -33,8 +33,6 @@ use common_hashtable::HashTableKeyable;
 use super::JoinHashTable;
 use super::ProbeState;
 use crate::common::EvalNode;
-use crate::common::HashMap;
-use crate::common::HashTableKeyable;
 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;

diff --git a/query/src/sql/optimizer/heuristic/subquery_rewriter.rs b/query/src/sql/optimizer/heuristic/subquery_rewriter.rs
@@ -308,6 +308,7 @@ impl SubqueryRewriter {
                 let column_name = format!("subquery_{}", index);
                 let left_condition = Scalar::BoundColumnRef(BoundColumnRef {
                     column: ColumnBinding {
+                        database_name: None,
                         table_name: None,
                         column_name,
                         index: *index,