From 8cd9103c3dc5fbef33c0140af25f5679457ec565 Mon Sep 17 00:00:00 2001 From: csch Date: Fri, 7 Apr 2023 17:10:22 +0800 Subject: [PATCH] fix some typo error --- src/sql/engine/cmd/ob_database_executor.cpp | 2 +- src/sql/engine/cmd/ob_table_executor.cpp | 6 +++--- src/sql/engine/subquery/ob_subplan_filter_op.cpp | 8 ++++---- src/sql/engine/subquery/ob_subplan_scan_op.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/sql/engine/cmd/ob_database_executor.cpp b/src/sql/engine/cmd/ob_database_executor.cpp index 1aa4d6bba4..f4b48ed970 100644 --- a/src/sql/engine/cmd/ob_database_executor.cpp +++ b/src/sql/engine/cmd/ob_database_executor.cpp @@ -203,7 +203,7 @@ int ObDropDatabaseExecutor::execute(ObExecContext &ctx, ObDropDatabaseStmt &stmt SQL_ENG_LOG(WARN, "get common rpc proxy failed", K(ret)); } else if (OB_ISNULL(common_rpc_proxy) || OB_ISNULL(ctx.get_my_session())) { ret = OB_ERR_UNEXPECTED; - SQL_ENG_LOG(WARN, "failt to get my session", K(ctx), K(common_rpc_proxy)); + SQL_ENG_LOG(WARN, "fail to get my session", K(ctx), K(common_rpc_proxy)); } else { obrpc::UInt64 affected_row(0); obrpc::ObDropDatabaseRes drop_database_res; diff --git a/src/sql/engine/cmd/ob_table_executor.cpp b/src/sql/engine/cmd/ob_table_executor.cpp index 84c3366240..988c0c6f7c 100644 --- a/src/sql/engine/cmd/ob_table_executor.cpp +++ b/src/sql/engine/cmd/ob_table_executor.cpp @@ -598,7 +598,7 @@ int ObCreateTableExecutor::execute(ObExecContext &ctx, ObCreateTableStmt &stmt) } } - // only CTAS or create temperary table will make session_id != 0. If such table detected, set + // only CTAS or create temporary table will make session_id != 0. If such table detected, set // need ctas cleanup task anyway to do some cleanup jobs if (0 != table_schema.get_session_id()) { LOG_TRACE("CTAS or temporary table create detected", K(table_schema)); @@ -2173,7 +2173,7 @@ int ObTruncateTableExecutor::execute(ObExecContext &ctx, ObTruncateTableStmt &st bool use_parallel_truncate = false; const uint64_t tenant_id = truncate_table_arg.tenant_id_; if (OB_FAIL(check_use_parallel_truncate(truncate_table_arg, use_parallel_truncate))) { - LOG_WARN("fail to check use parallel trunate", KR(ret), K(truncate_table_arg)); + LOG_WARN("fail to check use parallel truncate", KR(ret), K(truncate_table_arg)); } else if (!use_parallel_truncate) { if (OB_FAIL(common_rpc_proxy->truncate_table(truncate_table_arg, res))) { LOG_WARN("rpc proxy alter table failed", K(ret)); @@ -2372,7 +2372,7 @@ int ObFlashBackTableToScnExecutor::execute(ObExecContext &ctx, ObFlashBackTableT LOG_WARN("get common rpc proxy failed", K(ret)); } else if (OB_ISNULL(common_rpc_proxy)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("cmmon rpc proxy should not be null", K(ret)); + LOG_WARN("common rpc proxy should not be null", K(ret)); } else if (OB_FAIL(common_rpc_proxy->flashback_table_to_time_point(arg))) { LOG_WARN("rpc proxy flashback table failed", K(ret)); } diff --git a/src/sql/engine/subquery/ob_subplan_filter_op.cpp b/src/sql/engine/subquery/ob_subplan_filter_op.cpp index ede874a0a0..e9c8ca1126 100644 --- a/src/sql/engine/subquery/ob_subplan_filter_op.cpp +++ b/src/sql/engine/subquery/ob_subplan_filter_op.cpp @@ -596,7 +596,7 @@ int ObSubPlanFilterOp::switch_iterator() } else if (OB_FAIL(child_->switch_iterator())) { //TODO: 目前只支持对非相关子查询做多组迭代器切换,只切换主表 if (OB_ITER_END != ret) { - LOG_WARN("swtich child operator iterator failed", K(ret)); + LOG_WARN("switch child operator iterator failed", K(ret)); } } @@ -918,7 +918,7 @@ int ObSubPlanFilterOp::handle_next_batch_with_px_rescan(const int64_t op_max_bat } if (left_rows_total_cnt != left_rows_.get_row_cnt()) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("left_rows row cnt is unexpectd", K(ret)); + LOG_WARN("left_rows row cnt is unexpected", K(ret)); } } } @@ -1045,7 +1045,7 @@ int ObSubPlanFilterOp::handle_next_batch_with_group_rescan(const int64_t op_max_ LOG_WARN("prepare rescan params failed", K(ret)); } else if (left_rows_total_cnt != left_rows_.get_row_cnt()) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("left_rows row cnt is unexpectd", K(ret)); + LOG_WARN("left_rows row cnt is unexpected", K(ret)); } } @@ -1383,7 +1383,7 @@ int ObSubPlanFilterOp::handle_update_set() } } if (OB_SUCC(ret) && OB_FAIL(row_val.store_row_->to_expr(MY_SPEC.update_set_, eval_ctx_))) { - LOG_WARN("failed to get expr from chunck datum store. ", K(ret)); + LOG_WARN("failed to get expr from chunk datum store. ", K(ret)); } } } diff --git a/src/sql/engine/subquery/ob_subplan_scan_op.h b/src/sql/engine/subquery/ob_subplan_scan_op.h index 00c6f7b181..34d48a88d5 100644 --- a/src/sql/engine/subquery/ob_subplan_scan_op.h +++ b/src/sql/engine/subquery/ob_subplan_scan_op.h @@ -26,7 +26,7 @@ class ObSubPlanScanSpec : public ObOpSpec public: ObSubPlanScanSpec(common::ObIAllocator &alloc, const ObPhyOperatorType type); // project child output to subplan scan column. - // projector_is filled with [child output, scan column] paires, even index is child output, + // projector_is filled with [child output, scan column] pairs, even index is child output, // odd is scan column. e.g.: // [child output, scan column, child output, scan column, ...] ExprFixedArray projector_;