fix conflict

databendlabs · Dec 16, 2023 · ba19cd4 · ba19cd4
1 parent f89ef80
commit ba19cd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/query/service/src/interpreters/interpreter_merge_into.rs b/src/query/service/src/interpreters/interpreter_merge_into.rs
@@ -420,8 +420,8 @@ impl MergeIntoInterpreter {
                     ])),
                     true => DataSchemaRef::new(DataSchema::new(vec![DataField::new(
                         ROW_ID_COL_NAME,
-                        common_expression::types::DataType::Number(
-                            common_expression::types::NumberDataType::UInt64,
+                        databend_common_expression::types::DataType::Number(
+                            databend_common_expression::types::NumberDataType::UInt64,
                         ),
                     )])),
                 },

diff --git a/src/query/service/src/interpreters/interpreter_merge_into_static_filter.rs b/src/query/service/src/interpreters/interpreter_merge_into_static_filter.rs
@@ -493,7 +493,9 @@ impl MergeIntoInterpreter {
                 Arc::new(eval_build_side_join_expr_op.into()),
                 Arc::new(SExpr::create_unary(
                     // merge data here
-                    Arc::new(RelOperator::Exchange(common_sql::plans::Exchange::Merge)),
+                    Arc::new(RelOperator::Exchange(
+                        databend_common_sql::plans::Exchange::Merge,
+                    )),
                     Arc::new(build_plan.child(0)?.child(0)?.clone()),
                 )),
             )