From 4a35ecd899d4cbbd9d44ad3d3a1fcb97d76b599f Mon Sep 17 00:00:00 2001 From: chenhuiming Date: Thu, 13 Apr 2023 16:25:00 +0800 Subject: [PATCH] fix typo --- src/objit/src/expr/ob_expr_info_flag.h | 2 +- src/sql/resolver/dml/ob_select_stmt.h | 2 +- src/sql/resolver/dml/ob_sql_hint.cpp | 4 ++-- src/sql/resolver/dml/ob_sql_hint.h | 2 +- src/sql/resolver/dml/ob_stmt_expr_visitor.cpp | 2 +- src/sql/resolver/expr/ob_raw_expr.h | 10 +++++----- src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp | 2 +- src/sql/resolver/expr/ob_raw_expr_printer.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/objit/src/expr/ob_expr_info_flag.h b/src/objit/src/expr/ob_expr_info_flag.h index aa135e9338..c47de5bc76 100644 --- a/src/objit/src/expr/ob_expr_info_flag.h +++ b/src/objit/src/expr/ob_expr_info_flag.h @@ -22,7 +22,7 @@ enum ObExprInfoFlag { IS_CONST = 0x0, // const expression, e.g. 1.2, 'abc' IS_COLUMN, // column expression, e.g. C1, T1.C1 - IS_STATIC_PARAM, // vaiable expression, e.g. ? + IS_STATIC_PARAM, // variable expression, e.g. ? IS_AGG, // aggregate function, e.g. max, avg IS_FUNC, // system function IS_IN, diff --git a/src/sql/resolver/dml/ob_select_stmt.h b/src/sql/resolver/dml/ob_select_stmt.h index 74445c7792..dc26c7d7c4 100644 --- a/src/sql/resolver/dml/ob_select_stmt.h +++ b/src/sql/resolver/dml/ob_select_stmt.h @@ -154,7 +154,7 @@ struct ObSelectIntoItem ObItemType into_type_; common::ObObj outfile_name_; common::ObObj filed_str_; // filed terminated str - common::ObObj line_str_; // line teminated str + common::ObObj line_str_; // line terminated str common::ObSEArray user_vars_; // user variables common::ObSEArray pl_vars_; // pl variables char closed_cht_; // all fileds, "123","ab" diff --git a/src/sql/resolver/dml/ob_sql_hint.cpp b/src/sql/resolver/dml/ob_sql_hint.cpp index 3ea280ea45..6a4fc71f85 100644 --- a/src/sql/resolver/dml/ob_sql_hint.cpp +++ b/src/sql/resolver/dml/ob_sql_hint.cpp @@ -548,7 +548,7 @@ int ObQueryHint::reset_duplicate_qb_name() if (OB_UNLIKELY(OB_HASH_NOT_EXIST != ret)) { LOG_WARN("get stmt id from hash map failed", K(ret)); } else if (OB_FAIL(qb_name_map_.set_refactored(qb_names.qb_names_.at(0), i))) { - LOG_WARN("faield to add name map", K(ret)); + LOG_WARN("failed to add name map", K(ret)); } } else if (OB_UNLIKELY(idx < 0 || idx >= i)) { ret = OB_ERR_UNEXPECTED; @@ -704,7 +704,7 @@ int ObQueryHint::print_outline_data(PlanText &plan_text) const bool is_oneline = plan_text.is_oneline_; if (OB_UNLIKELY(1 < stmt_id_hints_.count())) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("unexpected stmt id hitns for outline data", K(ret), K(stmt_id_hints_)); + LOG_WARN("unexpected stmt id hints for outline data", K(ret), K(stmt_id_hints_)); } else if (OB_FAIL(BUF_PRINTF("%sBEGIN_OUTLINE_DATA", ObQueryHint::get_outline_indent(is_oneline)))) { } else if (1 == stmt_id_hints_.count() && OB_FAIL(stmt_id_hints_.at(0).print_hints(plan_text, true))) { diff --git a/src/sql/resolver/dml/ob_sql_hint.h b/src/sql/resolver/dml/ob_sql_hint.h index 2a417df527..e566dc6fc1 100644 --- a/src/sql/resolver/dml/ob_sql_hint.h +++ b/src/sql/resolver/dml/ob_sql_hint.h @@ -167,7 +167,7 @@ struct ObQueryHint { int64_t outline_stmt_id_; ObSEArray qb_hints_; // hints with qb name ObSEArray stmt_id_hints_; // hints without qb name, used before transform - ObSEArray trans_list_; // tranform hints from outline data, need keep order + ObSEArray trans_list_; // transform hints from outline data, need keep order ObSEArray outline_trans_hints_; // tranform hints to generate outline data ObSEArray used_trans_hints_; ObSEArray stmt_id_map_; // stmt id -> qb name list, position is stmt id diff --git a/src/sql/resolver/dml/ob_stmt_expr_visitor.cpp b/src/sql/resolver/dml/ob_stmt_expr_visitor.cpp index ed6e6dc17f..fcfe192181 100644 --- a/src/sql/resolver/dml/ob_stmt_expr_visitor.cpp +++ b/src/sql/resolver/dml/ob_stmt_expr_visitor.cpp @@ -133,7 +133,7 @@ int ObSharedExprChecker::init(ObDMLStmt &stmt) } if (OB_SUCC(ret)) { if (OB_FAIL(stmt_expr_set.destroy())) { - LOG_WARN("failed to detroy stmt expr set", K(ret)); + LOG_WARN("failed to destroy stmt expr set", K(ret)); } } return ret; diff --git a/src/sql/resolver/expr/ob_raw_expr.h b/src/sql/resolver/expr/ob_raw_expr.h index b30dcd06dc..a5d10e5129 100644 --- a/src/sql/resolver/expr/ob_raw_expr.h +++ b/src/sql/resolver/expr/ob_raw_expr.h @@ -159,7 +159,7 @@ extern ObRawExpr *USELESS_POINTER; #define IS_SPATIAL_EXPR(op) \ ((op) >= T_FUN_SYS_ST_LONGITUDE && (op) <= T_FUN_SYS_ST_LATITUDE) -// ObSqlBitSet is a simple bitset, in order to avoid memory explosure +// ObSqlBitSet is a simple bitset, in order to avoid memory exposure // ObBitSet is too large just for a simple bitset const static int64_t DEFAULT_SQL_BITSET_SIZE = 32; templatecreate_raw_expr(expr_type, raw_expr))) { SQL_RESV_LOG(WARN, "failed to create raw expr by pl factory", K(ret)); } else { diff --git a/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp b/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp index eac32cc613..3c2df74675 100644 --- a/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp @@ -377,7 +377,7 @@ int ObRawExprDeduceType::calc_result_type(ObNonTerminalRawExpr &expr, // 以防calc_result_typeX没有对其进行设置 // 理想情况下，不应该要这个循环，所有calc_type的设置都在calc_result_typeX中完成 - // For avg(), internally it will call 'divison', which requires that both input are + // For avg(), internally it will call 'division', which requires that both input are // casted into number. However, this requirements are not remembered in the input_types // for the avg() expression but as the calc_type for the input expression itself. This // demands that we set the calculation type here. diff --git a/src/sql/resolver/expr/ob_raw_expr_printer.h b/src/sql/resolver/expr/ob_raw_expr_printer.h index fee4e25d07..0be5fb2594 100644 --- a/src/sql/resolver/expr/ob_raw_expr_printer.h +++ b/src/sql/resolver/expr/ob_raw_expr_printer.h @@ -167,7 +167,7 @@ private: char *buf_; int64_t buf_len_; // avoid to update pos_ between different printers(mainly ObRawExprPrinter - // and ObSelectStmtPrinter), we definate pointer of pos_ rather than object + // and ObSelectStmtPrinter), we definite pointer of pos_ rather than object int64_t *pos_; ObStmtScope scope_; bool only_column_namespace_;