From e5ea52d2e740b9c3f379d573fb681a9e35a61213 Mon Sep 17 00:00:00 2001 From: Klawz Date: Thu, 13 Jan 2022 15:22:51 +0800 Subject: [PATCH] fix typos --- src/sql/optimizer/ob_delete_log_plan.cpp | 2 +- src/sql/resolver/dml/ob_update_resolver.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sql/optimizer/ob_delete_log_plan.cpp b/src/sql/optimizer/ob_delete_log_plan.cpp index 6370f5d369..ece94a3ae0 100644 --- a/src/sql/optimizer/ob_delete_log_plan.cpp +++ b/src/sql/optimizer/ob_delete_log_plan.cpp @@ -275,7 +275,7 @@ int ObDeleteLogPlan::allocate_delete_as_top(ObLogicalOperator *&top, } else if (delete_stmt->is_error_logging() && OB_FAIL(delete_op->extract_err_log_info())) { LOG_WARN("failed to extract error log info", K(ret)); } else if (OB_FAIL(delete_op->compute_property())) { - LOG_WARN("failed to compute propery", K(ret)); + LOG_WARN("failed to compute property", K(ret)); } else { top = delete_op; } diff --git a/src/sql/resolver/dml/ob_update_resolver.cpp b/src/sql/resolver/dml/ob_update_resolver.cpp index 8d7ca292f4..01431dda55 100644 --- a/src/sql/resolver/dml/ob_update_resolver.cpp +++ b/src/sql/resolver/dml/ob_update_resolver.cpp @@ -172,7 +172,7 @@ int ObUpdateResolver::resolve(const ParseNode &parse_tree) LOG_WARN("failed to resolve error logging", K(ret)); } else if (is_mysql_mode() && !update_stmt->is_ignore() && OB_FAIL(check_join_update_conflict())) { - LOG_WARN("failed to check join update confilct", K(ret)); + LOG_WARN("failed to check join update conflict", K(ret)); } else if (OB_FAIL(update_stmt->formalize_stmt(session_info_))) { LOG_WARN("pull update stmt all expr relation ids failed", K(ret)); } else { /*do nothing*/ } @@ -184,7 +184,7 @@ int ObUpdateResolver::resolve(const ParseNode &parse_tree) } else if (OB_FAIL(update_stmt->check_dml_need_filter_null())) { LOG_WARN("failed to check dml need filter null", K(ret)); } else if (lib::is_mysql_mode() && OB_FAIL(check_safe_update_mode(update_stmt))) { - LOG_WARN("failed to check fullfill safe update mode", K(ret)); + LOG_WARN("failed to check fulfill safe update mode", K(ret)); } else { /*do nothing*/ } } return ret; @@ -195,7 +195,7 @@ int ObUpdateResolver::try_expand_returning_exprs() int ret = OB_SUCCESS; ObUpdateStmt *update_stmt = NULL; // we do not need expand returing expr in prepare stage because we resolve - // it twice, first in prepare stage, second in actural execution. We can only + // it twice, first in prepare stage, second in actual execution. We can only // do it in second stage // Otherwise if we expand in prepare stage, which will pollute our spell SQL // then got a wrong result @@ -227,7 +227,7 @@ int ObUpdateResolver::try_expand_returning_exprs() LOG_WARN("failed to add uncopy exprs", K(ret)); } else if (OB_FAIL(copier.copy_on_replace(update_stmt->get_returning_exprs(), update_stmt->get_returning_exprs()))) { - LOG_WARN("failed to copy on repalce returning exprs", K(ret)); + LOG_WARN("failed to copy on replace returning exprs", K(ret)); } } }