diff --git a/src/objit/src/expr/ob_expr_info_flag.h b/src/objit/src/expr/ob_expr_info_flag.h index 729add75f4..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, @@ -87,7 +87,7 @@ enum ObExprInfoFlag IS_JOIN_COND, // column = column of different tables IS_COLUMNLIZED, // for code generator, @see ObExprGenerator IS_ROOT, //for code generator, @see ObExprGenerator - IS_DYNAMIC_PARAM, //for opt to distinguish normal paramaterized const and exec-params + IS_DYNAMIC_PARAM, //for opt to distinguish normal parameterized const and exec-params IS_NEW_AGG_EXPR, IS_WITH_ALL, IS_WITH_ANY, @@ -167,5 +167,5 @@ inline const char* get_expr_info_flag_str(const ObExprInfoFlag flag) return ret; } } // namespace sql -} // namespace oceabase +} // namespace oceanbase #endif /* OCEANBASE_SRC_SQL_RESOLVER_EXPR_OB_EXPR_INFO_FLAG_H_ */ diff --git a/src/sql/optimizer/ob_insert_all_log_plan.cpp b/src/sql/optimizer/ob_insert_all_log_plan.cpp index d0ff4436c7..345d181f61 100644 --- a/src/sql/optimizer/ob_insert_all_log_plan.cpp +++ b/src/sql/optimizer/ob_insert_all_log_plan.cpp @@ -127,7 +127,7 @@ int ObInsertAllLogPlan::allocate_insert_values_as_top(ObLogicalOperator *&top) } else if (insert_all_stmt->is_error_logging() && OB_FAIL(values_op->extract_err_log_info())) { LOG_WARN("failed to extract error log exprs", K(ret)); } else if (OB_FAIL(values_op->compute_property())) { - LOG_WARN("failed to compute propery", K(ret)); + LOG_WARN("failed to compute property", K(ret)); } else { if (NULL != top) { values_op->add_child(top); diff --git a/src/sql/optimizer/ob_log_expr_values.cpp b/src/sql/optimizer/ob_log_expr_values.cpp index a4fc3a91eb..fcfca6c7bb 100644 --- a/src/sql/optimizer/ob_log_expr_values.cpp +++ b/src/sql/optimizer/ob_log_expr_values.cpp @@ -145,7 +145,7 @@ int ObLogExprValues::compute_fd_item_set() if (OB_FAIL(ret)) { /*do nothing*/ } else if (OB_FAIL(deduce_const_exprs_and_ft_item_set(*fd_item_set))) { - LOG_WARN("falied to deduce fd item set", K(ret)); + LOG_WARN("failed to deduce fd item set", K(ret)); } else { set_fd_item_set(fd_item_set); } diff --git a/src/sql/optimizer/ob_log_join.cpp b/src/sql/optimizer/ob_log_join.cpp index a9fc22efe7..95f9a9383d 100644 --- a/src/sql/optimizer/ob_log_join.cpp +++ b/src/sql/optimizer/ob_log_join.cpp @@ -957,7 +957,7 @@ int ObLogJoin::allocate_granule_post(AllocGIContext &ctx) // 并且 nlj 向左支 request 一个 part id // 通知 GI 在迭代 partition granule 时进入 partition pruning 模式 if (OB_FAIL(build_gi_partition_pruning())) { - LOG_WARN("fail deterimine right child partition id", K(ret)); + LOG_WARN("fail determine right child partition id", K(ret)); } } return ret; diff --git a/src/sql/optimizer/ob_log_table_scan.cpp b/src/sql/optimizer/ob_log_table_scan.cpp index 007db0ce04..486b42772a 100644 --- a/src/sql/optimizer/ob_log_table_scan.cpp +++ b/src/sql/optimizer/ob_log_table_scan.cpp @@ -152,7 +152,7 @@ int ObLogTableScan::get_op_exprs(ObIArray &all_exprs) ret = OB_ERR_UNEXPECTED; LOG_WARN("get unexpected null", K(ret)); } else if (OB_FAIL(generate_access_exprs())) { - LOG_WARN("failed to generate acess exprs", K(ret)); + LOG_WARN("failed to generate access exprs", K(ret)); } else if (NULL != limit_count_expr_ && OB_FAIL(all_exprs.push_back(limit_count_expr_))) { LOG_WARN("failed to push back expr", K(ret)); @@ -317,7 +317,7 @@ int ObLogTableScan::copy_filter_before_index_back() } else { bool is_contain_vir_gen_column = false; // ObArray column_exprs; - // scan_pushdown before index back conculde virtual generated column + // scan_pushdown before index back conclude virtual generated column // need copy for avoiding shared expression. if (OB_FAIL(ObRawExprUtils::contain_virtual_generated_column(filters.at(i), is_contain_vir_gen_column))) { LOG_WARN("fail to contain virtual gen column", K(ret)); @@ -1836,7 +1836,7 @@ int ObLogTableScan::print_used_hint(PlanText &plan_text) } else if (!is_skip_scan() && T_INDEX_SS_HINT == hint->get_hint_type()) { /* is not index skip scan but exist index_ss hint */ } else if (OB_FAIL(hint->print_hint(plan_text))) { - LOG_WARN("failed to print indedx hint", K(ret), K(*hint)); + LOG_WARN("failed to print index hint", K(ret), K(*hint)); } } } else {// print all no index @@ -1847,7 +1847,7 @@ int ObLogTableScan::print_used_hint(PlanText &plan_text) ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpected NULL", K(ret), K(hint)); } else if (OB_FAIL(hint->print_hint(plan_text))) { - LOG_WARN("failed to print indedx hint", K(ret), K(*hint)); + LOG_WARN("failed to print index hint", K(ret), K(*hint)); } } } diff --git a/src/sql/optimizer/ob_log_topk.cpp b/src/sql/optimizer/ob_log_topk.cpp index 57b33b9d6d..62cb8a501b 100644 --- a/src/sql/optimizer/ob_log_topk.cpp +++ b/src/sql/optimizer/ob_log_topk.cpp @@ -105,7 +105,7 @@ int ObLogTopk::est_cost() if (OB_ISNULL(child = get_child(first_child)) || OB_ISNULL(get_stmt()) || OB_ISNULL(get_plan())) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("get unexpeced null", K(child), K(get_stmt()), K(get_plan()),K(ret)); + LOG_WARN("get unexpected null", K(child), K(get_stmt()), K(get_plan()),K(ret)); } else if (OB_UNLIKELY((parallel = get_parallel()) < 1)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("get unexpected parallel degree", K(ret)); diff --git a/src/sql/optimizer/ob_merge_log_plan.cpp b/src/sql/optimizer/ob_merge_log_plan.cpp index fd238c5335..4b2ae5e7cf 100644 --- a/src/sql/optimizer/ob_merge_log_plan.cpp +++ b/src/sql/optimizer/ob_merge_log_plan.cpp @@ -524,7 +524,7 @@ bool ObMergeLogPlan::match_same_partition(const ObShardingInfo &l_sharding_info, } // When insert_sharding and update_sharding match same partition, -// need add euqal constraints for const params in sharding conditions which equal to part key. +// need add equal constraints for const params in sharding conditions which equal to part key. int ObMergeLogPlan::generate_equal_constraint(ObLogicalOperator &top, ObShardingInfo &insert_sharding, bool &can_gen_cons, @@ -552,7 +552,7 @@ int ObMergeLogPlan::generate_equal_constraint(ObLogicalOperator &top, LOG_WARN("get unexpected null", K(ret), K(target_table_scan)); } else if (OB_FAIL(append(right_conds, target_table_scan->get_range_conditions())) ||OB_FAIL(append(right_conds, target_table_scan->get_filter_exprs()))) { - LOG_WARN("failed to append epxrs", K(ret)); + LOG_WARN("failed to append exprs", K(ret)); } else if (OB_FAIL(insert_sharding.get_all_partition_keys(left_part_keys))) { LOG_WARN("failed to get partition keys", K(ret)); } else if (OB_FAIL(target_table_scan->get_sharding()->get_all_partition_keys(right_part_keys))) { @@ -864,7 +864,7 @@ int ObMergeLogPlan::prepare_table_dml_info_update(const ObMergeTableInfo& merge_ LOG_WARN("failed to get table schema", K(merge_info), K(ret)); } else if (!merge_info.is_link_table_ && OB_FAIL(check_update_part_key(index_schema, table_dml_info))) { - LOG_WARN("faield to check update part key", K(ret)); + LOG_WARN("failed to check update part key", K(ret)); } else { for (int64_t i = 0; OB_SUCC(ret) && i < table_dml_info->ck_cst_exprs_.count(); ++i) { if (OB_FAIL(ObDMLResolver::copy_schema_expr(optimizer_context_.get_expr_factory(), @@ -1027,7 +1027,7 @@ int ObMergeLogPlan::check_merge_stmt_need_multi_partition_dml(bool &is_multi_par } else if (OB_FAIL(merge_stmt->part_key_has_subquery(has_subquery_part_key))) { LOG_WARN("failed to check part key has subquery", K(ret)); } else if (OB_FAIL(merge_stmt->part_key_has_auto_inc(has_auto_inc_part_key))) { - LOG_WARN("check to check whether part key containts auto inc column", K(ret)); + LOG_WARN("check to check whether part key contains auto inc column", K(ret)); } else if (has_rand_part_key || has_subquery_part_key || has_auto_inc_part_key) { is_multi_part_dml = true; } else { /*do nothing*/ } diff --git a/src/sql/optimizer/ob_opt_est_cost_model.cpp b/src/sql/optimizer/ob_opt_est_cost_model.cpp index f2beaef485..ac2bdb26aa 100644 --- a/src/sql/optimizer/ob_opt_est_cost_model.cpp +++ b/src/sql/optimizer/ob_opt_est_cost_model.cpp @@ -86,7 +86,7 @@ double ObTableMetaInfo::get_micro_block_numbers() const { double ret = 0.0; if (micro_block_count_ <= 0) { - // calculate micore block count use storage statistics + // calculate micro block count use storage statistics ret = 0; } else { // get micro block count from optimizer statistics @@ -1399,7 +1399,7 @@ int ObOptEstCostModel::cost_table_get_one_batch(const ObCostTableScanInfo &est_c OB_FAIL(cost_table_lookup_rpc(index_back_row_count, est_cost_info, network_cost))) { - LOG_WARN("failed to get newwork transform cost for global index", K(ret)); + LOG_WARN("failed to get network transform cost for global index", K(ret)); } else { get_cost = base_cost + ib_cost + network_cost; get_index_back_cost = ib_cost + network_cost; diff --git a/src/sql/optimizer/ob_opt_est_utils.h b/src/sql/optimizer/ob_opt_est_utils.h index 6701cd8bb1..cc36776269 100644 --- a/src/sql/optimizer/ob_opt_est_utils.h +++ b/src/sql/optimizer/ob_opt_est_utils.h @@ -155,7 +155,7 @@ private: uint64_t &convertable_map, int64_t pos); // 1, find common prefix length of strings - // 2, find dynamix base and offset of strings + // 2, find dynamic base and offset of strings // 3, use dynamic base and offset to convert strings to scalars static int convert_strings_to_scalar(const common::ObIArray &origin_strs, common::ObIArray &scalars); diff --git a/src/sql/optimizer/ob_optimizer.h b/src/sql/optimizer/ob_optimizer.h index b8b9929a14..6ac0ea819f 100644 --- a/src/sql/optimizer/ob_optimizer.h +++ b/src/sql/optimizer/ob_optimizer.h @@ -56,7 +56,7 @@ namespace sql */ PROJECT_PRUNING, /** - * Exchange allocation is also known as parallel optimzation. Though there + * Exchange allocation is also known as parallel optimization. Though there * are multiple possible optimization that can happen in this step, at the * moment we just perform simple check on table location and insert pairs of * exchange nodes at places where data exchange needs to happen(local diff --git a/src/sql/resolver/dcl/ob_create_user_resolver.cpp b/src/sql/resolver/dcl/ob_create_user_resolver.cpp index 1011218087..c3dbb8b232 100644 --- a/src/sql/resolver/dcl/ob_create_user_resolver.cpp +++ b/src/sql/resolver/dcl/ob_create_user_resolver.cpp @@ -120,7 +120,7 @@ int ObCreateUserResolver::resolve(const ParseNode &parse_tree) if (lib::is_oracle_mode() && 0 != host_name.compare(OB_DEFAULT_HOST_NAME)) { ret = OB_NOT_SUPPORTED; LOG_USER_ERROR(OB_NOT_SUPPORTED, "create user with hostname"); - LOG_WARN("create user shoud not use hostname in oracle mode", K(ret)); + LOG_WARN("create user should not use hostname in oracle mode", K(ret)); } ObString password; ObString need_enc_str = ObString::make_string("NO"); diff --git a/src/sql/resolver/dcl/ob_dcl_resolver.cpp b/src/sql/resolver/dcl/ob_dcl_resolver.cpp index 577e75dbbb..0b671d08d1 100644 --- a/src/sql/resolver/dcl/ob_dcl_resolver.cpp +++ b/src/sql/resolver/dcl/ob_dcl_resolver.cpp @@ -93,7 +93,7 @@ int ObDCLResolver::check_password_strength(common::ObString &password) } } else { ret = OB_ERR_UNEXPECTED; - LOG_WARN("the value of password policy is unexpectd", K(ret)); + LOG_WARN("the value of password policy is unexpected", K(ret)); } if (OB_SUCC(ret)) { if (OB_UNLIKELY(!passed)) { diff --git a/src/sql/resolver/dcl/ob_drop_user_resolver.cpp b/src/sql/resolver/dcl/ob_drop_user_resolver.cpp index 5b898a91c1..fa32b24db8 100644 --- a/src/sql/resolver/dcl/ob_drop_user_resolver.cpp +++ b/src/sql/resolver/dcl/ob_drop_user_resolver.cpp @@ -95,7 +95,7 @@ int ObDropUserResolver::resolve(const ParseNode &parse_tree) SQL_RESV_LOG(WARN, "user_list_node is null", K(ret)); } else { uint64_t tenant_id = params_.session_info_->get_effective_tenant_id(); - // resovle user_list_node + // resolved user_list_node for (int i = 0; i < user_list_node->num_child_ && OB_SUCCESS == ret; ++i) { if (OB_ISNULL(user_list_node->children_[i])) { ret = OB_ERR_PARSE_SQL; diff --git a/src/sql/resolver/dcl/ob_grant_stmt.cpp b/src/sql/resolver/dcl/ob_grant_stmt.cpp index 064407ca53..c0b01bf765 100644 --- a/src/sql/resolver/dcl/ob_grant_stmt.cpp +++ b/src/sql/resolver/dcl/ob_grant_stmt.cpp @@ -117,7 +117,7 @@ int ObGrantStmt::add_role(const common::ObString &role) // Pust the first user_name and host_name into role[0] and role[1] // And the rest of user_names and host_names shall be saved in remain_roles -// The remain_roles is used to keep compatibility with previouse logic +// The remain_roles is used to keep compatibility with previous logic int ObGrantStmt::add_user(const common::ObString &user_name, const common::ObString &host_name) { diff --git a/src/sql/resolver/dml/ob_dml_resolver.h b/src/sql/resolver/dml/ob_dml_resolver.h index 0df8684092..e4036ae95a 100644 --- a/src/sql/resolver/dml/ob_dml_resolver.h +++ b/src/sql/resolver/dml/ob_dml_resolver.h @@ -823,7 +823,7 @@ private: // a synonym may a dblink synonym, while failed to resolving a sysnonym to a table name, // wo should try to resolving to a dblink name. - // in out param: table_name, in: may someting link "remote_schema.test@my_link", out: "test" + // in out param: table_name, in: may something link "remote_schema.test@my_link", out: "test" // out param: dblink_name("my_link"), db_name("remote_schema"), dblink_id(id of my_link) int resolve_dblink_with_synonym(uint64_t tenant_id, ObString &table_name, ObString &dblink_name, ObString &db_name, uint64_t &dblink_id); @@ -853,7 +853,7 @@ private: ObIArray &opt_hints); int resolve_index_hint(const ParseNode &index_node, ObOptHint *&opt_hint); - int resolve_index_hint(const TableItem &table, // resovle mysql mode index hint after table + int resolve_index_hint(const TableItem &table, // resolved mysql mode index hint after table const ParseNode &index_hint_node); int resolve_table_parallel_hint(const ParseNode &hint_node, ObOptHint *&opt_hint); int resolve_join_order_hint(const ParseNode &hint_node, ObOptHint *&opt_hint); @@ -970,7 +970,7 @@ protected: /* * 在with clause的解析中,我们不能将解析的表添加到影响此plan是否需要进入trans_service - * 的globle_dependency_table中去。 + * 的global_dependency_table中去。 * 例如: * with cte (select * from t1) select 1 from dual; * 如果加入了,上面这句将会进入trans_service,而之后则会报错,因为其实它检测到相关table的 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/dml/ob_update_stmt.h b/src/sql/resolver/dml/ob_update_stmt.h index b254e0441f..21e6abf7cc 100644 --- a/src/sql/resolver/dml/ob_update_stmt.h +++ b/src/sql/resolver/dml/ob_update_stmt.h @@ -21,7 +21,7 @@ namespace oceanbase namespace sql { /** - * UPDATE syntac from MySQL 5.7 + * UPDATE syntax from MySQL 5.7 * * Single-table syntax: UPDATE [LOW_PRIORITY] [IGNORE] table_reference diff --git a/src/sql/resolver/expr/ob_raw_expr.cpp b/src/sql/resolver/expr/ob_raw_expr.cpp index b6f2c2b96e..f02219a895 100644 --- a/src/sql/resolver/expr/ob_raw_expr.cpp +++ b/src/sql/resolver/expr/ob_raw_expr.cpp @@ -910,7 +910,7 @@ int ObConstRawExpr::inner_deep_copy(ObIRawExprCopier &copier) } else if (OB_FAIL(deep_copy_obj(*inner_alloc_, value_, tmp))) { LOG_WARN("deep copy error", K(value_), K(ret)); } else if (OB_FAIL(ob_write_string(*inner_alloc_, literal_prefix_, literal_prefix_))) { - LOG_WARN("failed to werite string", K(ret)); + LOG_WARN("failed to write string", K(ret)); } else { value_ = tmp; } @@ -3934,7 +3934,7 @@ int ObSysFunRawExpr::get_name_internal(char *buf, const int64_t buf_len, int64_t if (get_param_count() >= 1) { if (OB_ISNULL(get_param_expr(i))) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("poram expr is NULL", K(i), K(ret)); + LOG_WARN("param expr is NULL", K(i), K(ret)); } else if (OB_FAIL(get_param_expr(i)->get_name(buf, buf_len, pos, type))) { LOG_WARN("fail to get_name", K(ret)); } else {} @@ -4193,7 +4193,7 @@ int ObNormalDllUdfRawExpr::set_udf_meta(const share::schema::ObUDF &udf) udf_meta_.ret_ = udf.get_ret(); udf_meta_.type_ = udf.get_type(); - /* data from schame, deep copy maybe a better choices */ + /* data from schema, deep copy maybe a better choices */ if (OB_ISNULL(inner_alloc_)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("inner allocator or expr factory is NULL", K(inner_alloc_), K(ret)); @@ -4429,7 +4429,7 @@ int ObObjectConstructRawExpr::assign(const ObRawExpr &other) if (OB_FAIL(elem_types_.assign(tmp.elem_types_))) { LOG_WARN("failed to assign elem types", K(ret)); } else if (OB_FAIL(access_names_.assign(tmp.access_names_))) { - LOG_WARN("failed to assgin access names", K(ret)); + LOG_WARN("failed to assign access names", K(ret)); } } } @@ -5047,10 +5047,10 @@ int Bound::replace_expr(const common::ObIArray &other_exprs, int ret = OB_SUCCESS; if (OB_FAIL(ObTransformUtils::replace_expr( other_exprs, new_exprs, interval_expr_))) { - LOG_WARN("failed to repalce exprs", K(ret)); + LOG_WARN("failed to replace exprs", K(ret)); } else if (OB_FAIL(ObTransformUtils::replace_expr( other_exprs, new_exprs, date_unit_expr_))) { - LOG_WARN("failed to repalce exprs", K(ret)); + LOG_WARN("failed to replace exprs", K(ret)); } for (int i = 0; OB_SUCC(ret) && i < BOUND_EXPR_MAX; ++i) { if (OB_ISNULL(exprs_[i])) { @@ -5839,7 +5839,7 @@ bool ObExprParamCheckContext::compare_const(const ObConstRawExpr &left, const Ob const ObRawExpr *left_param = NULL; const ObRawExpr *right_param = NULL; if (OB_FAIL(get_calc_expr(left.get_value().get_unknown(), left_param))) { - LOG_WARN("faield to get calculable expr", K(ret)); + LOG_WARN("failed to get calculable expr", K(ret)); } else if (OB_FAIL(get_calc_expr(right.get_value().get_unknown(), right_param))) { LOG_WARN("failed to get calculable expr", K(ret)); } else if (OB_ISNULL(left_param) || OB_ISNULL(right_param)) { 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_canonicalizer_impl.cpp b/src/sql/resolver/expr/ob_raw_expr_canonicalizer_impl.cpp index c0ed06b83a..3cc6339d43 100644 --- a/src/sql/resolver/expr/ob_raw_expr_canonicalizer_impl.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_canonicalizer_impl.cpp @@ -453,7 +453,7 @@ int ObRawExprCanonicalizerImpl::push_not(ObRawExpr *&expr) } for (int64_t i = 0; OB_SUCC(ret) && i < expr->get_param_count(); ++i) { if (OB_FAIL(SMART_CALL(push_not(expr->get_param_expr(i))))) { - LOG_WARN("fialed to push not expr", K(ret)); + LOG_WARN("failed to push not expr", K(ret)); } } } diff --git a/src/sql/resolver/expr/ob_raw_expr_copier.h b/src/sql/resolver/expr/ob_raw_expr_copier.h index 2ca648b6f3..fdc5c6674f 100644 --- a/src/sql/resolver/expr/ob_raw_expr_copier.h +++ b/src/sql/resolver/expr/ob_raw_expr_copier.h @@ -197,7 +197,7 @@ int ObRawExprCopier::copy_on_replace(const common::ObIArray &from_exprs, } } if (OB_SUCC(ret) && OB_FAIL(to_exprs.assign(tmp_arr))) { - SQL_RESV_LOG(WARN, "failed to assgin replaced results", K(ret)); + SQL_RESV_LOG(WARN, "failed to assign replaced results", K(ret)); } return ret; } 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 2a3e3f5666..0745c39341 100644 --- a/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp @@ -240,7 +240,7 @@ int ObRawExprDeduceType::calc_result_type_with_const_arg( /* Most expressions not accept lob type parameters. It reports an error in two situations before: * 1. report an error in calc_result_type function of expression; - * 2. cast lob to calc_type not suppoted/expected. + * 2. cast lob to calc_type not supported/expected. * Only a few expressions deal with lob type parameters in calc_result_type, so most errors caused by 2. * However, this makes some problems: * For example, cast lob to number is not supported before, and this results that nvl(lob, number) @@ -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. @@ -2835,7 +2835,7 @@ int ObRawExprDeduceType::set_agg_udf_result_type(ObAggFunRawExpr &expr) int ret = OB_SUCCESS; ObIArray ¶m_exprs = expr.get_real_param_exprs_for_update(); common::ObSEArray udf_attributes; /* udf's input args' name */ - common::ObSEArray udf_attributes_types; /* udf's aatribute type */ + common::ObSEArray udf_attributes_types; /* udf's attribute type */ common::ObSEArray const_results; /* const input expr' result */ ObAggUdfFunction udf_func; const share::schema::ObUDFMeta &udf_meta = expr.get_udf_meta(); @@ -3299,7 +3299,7 @@ int ObRawExprDeduceType::add_implicit_cast(ObAggFunRawExpr &parent, ObRawExpr *&child_ptr = real_param_exprs.at(i); if (skip_cast_expr(parent, i)) { // do nothing - //兼容oralce行为,regr_sxx和regr_syy只需在计算的参数加cast,regr_sxy行为和regr_syy一致,比较诡异,暂时兼容 + //兼容oracle行为,regr_sxx和regr_syy只需在计算的参数加cast,regr_sxy行为和regr_syy一致,比较诡异,暂时兼容 } else if ((parent.get_expr_type() == T_FUN_REGR_SXX && i == 0) || (parent.get_expr_type() == T_FUN_REGR_SYY && i == 1) || (parent.get_expr_type() == T_FUN_REGR_SXY && i == 1) || diff --git a/src/sql/resolver/expr/ob_raw_expr_deduce_type.h b/src/sql/resolver/expr/ob_raw_expr_deduce_type.h index a390008344..b6fbb16e0c 100644 --- a/src/sql/resolver/expr/ob_raw_expr_deduce_type.h +++ b/src/sql/resolver/expr/ob_raw_expr_deduce_type.h @@ -110,7 +110,7 @@ private: int add_implicit_cast_for_op_row(ObRawExpr *&child_ptr, const common::ObIArray &input_types, const ObCastMode &cast_mode); - // try add cast expr on subquery stmt's oubput && update column types. + // try add cast expr on subquery stmt's output && update column types. int add_implicit_cast_for_subquery(ObQueryRefRawExpr &expr, const common::ObIArray &input_types, const ObCastMode &cast_mode); diff --git a/src/sql/resolver/expr/ob_raw_expr_info_extractor.cpp b/src/sql/resolver/expr/ob_raw_expr_info_extractor.cpp index da6baf799a..ec8e4948d2 100644 --- a/src/sql/resolver/expr/ob_raw_expr_info_extractor.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_info_extractor.cpp @@ -515,7 +515,7 @@ int ObRawExprInfoExtractor::visit(ObSysFunRawExpr &expr) } else if (T_FUN_NORMAL_UDF == expr.get_expr_type() || T_FUN_AGG_UDF == expr.get_expr_type()) { /* - * it seems we have no chioce but to set the udf uncalculable. + * it seems we have no choice but to set the udf uncalculable. * we can not say a udf expr is const or not util we finish the xxx_init() function. * but we do the xxx_init() at the expr deduce type stage which was done after we * extractor info from expr. diff --git a/src/sql/resolver/expr/ob_raw_expr_modify_column_name.h b/src/sql/resolver/expr/ob_raw_expr_modify_column_name.h index d32c08d62c..f0e4fa83f9 100644 --- a/src/sql/resolver/expr/ob_raw_expr_modify_column_name.h +++ b/src/sql/resolver/expr/ob_raw_expr_modify_column_name.h @@ -37,7 +37,7 @@ public: int modifyColumnName(ObRawExpr &expr); - // interface of ObRawExprVistor + // interface of ObRawExprVisitor virtual int visit(ObConstRawExpr &expr); virtual int visit(ObExecParamRawExpr &expr); virtual int visit(ObVarRawExpr &expr); diff --git a/src/sql/resolver/expr/ob_raw_expr_printer.cpp b/src/sql/resolver/expr/ob_raw_expr_printer.cpp index 4531fcac4a..124b6dca5f 100644 --- a/src/sql/resolver/expr/ob_raw_expr_printer.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_printer.cpp @@ -279,7 +279,7 @@ int ObRawExprPrinter::print(ObConstRawExpr *expr) } } else if (expr->get_expr_type() == T_DATE && OB_FAIL(databuff_printf(buf_, buf_len_, *pos_, "date "))) { - LOG_WARN("fail to print date strign", K(ret)); + LOG_WARN("fail to print date string", K(ret)); } else if (T_BOOL == expr->get_expr_type()) { /** * For SQL like "select * from T1 where C1 = 1 and C1 = 2", @@ -562,10 +562,10 @@ int ObRawExprPrinter::print(ObOpRawExpr *expr) case T_OP_NE: case T_OP_SQ_NE: SET_SYMBOL_IF_EMPTY("<>"); - case T_OP_IN: // in sub-query wille be rewrited as expr = ANY(sub-query) + case T_OP_IN: // in sub-query will be rewrited as expr = ANY(sub-query) SET_SYMBOL_IF_EMPTY("in"); case T_OP_NOT_IN: - SET_SYMBOL_IF_EMPTY("not in"); // not in sub-query wille be rewrited as expr != all(sub-query) + SET_SYMBOL_IF_EMPTY("not in"); // not in sub-query will be rewrited as expr != all(sub-query) case T_OP_BIT_OR: SET_SYMBOL_IF_EMPTY("|"); case T_OP_BIT_XOR: @@ -2857,7 +2857,7 @@ int ObRawExprPrinter::print(ObSysFunRawExpr *expr) PRINT_IDENT_WITH_QUOT(seq_expr->get_action()); } else { ret = OB_ERR_UNEXPECTED; - LOG_WARN("sequence should sepcify format as seqname.action", K(ret)); + LOG_WARN("sequence should specify format as seqname.action", K(ret)); } if (OB_SUCC(ret) && seq_expr->is_dblink_sys_func()) { DATA_PRINTF("@%.*s", LEN_AND_PTR(seq_expr->get_dblink_name())); @@ -3256,7 +3256,7 @@ int ObRawExprPrinter::print(ObUDFRawExpr *expr) if (params_type.at(i).is_null()) { // default parameter, do not print // do nothing ... } else if (0 == i && expr->get_is_udt_cons()) { - // do not print construnct null self argument + // do not print construct null self argument } else { if (!params_name.at(i).empty()) { PRINT_IDENT_WITH_QUOT(params_name.at(i)); @@ -3777,7 +3777,7 @@ int ObRawExprPrinter::print_partition_exprs(ObWinFunRawExpr *expr) for (int64_t i = 0; OB_SUCC(ret) && i < N; ++i) { if (OB_ISNULL(expr->get_partition_exprs().at(i))) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("failed to get partiton by exprs.", K(ret)); + LOG_WARN("failed to get partition by exprs.", K(ret)); } else { PRINT_EXPR(expr->get_partition_exprs().at(i)); if (i < N - 1) { 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_; diff --git a/src/sql/resolver/expr/ob_raw_expr_replacer.cpp b/src/sql/resolver/expr/ob_raw_expr_replacer.cpp index 74aad967f4..ad3de654e1 100644 --- a/src/sql/resolver/expr/ob_raw_expr_replacer.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_replacer.cpp @@ -51,7 +51,7 @@ int ObRawExprReplacer::replace(ObRawExpr *&expr) expr = new_expr; replace_happened_ = true; } else if (OB_FAIL(expr->preorder_accept(*this))) { - LOG_WARN("failed to preorder accecpt expr", K(ret)); + LOG_WARN("failed to preorder accept expr", K(ret)); } return ret; } diff --git a/src/sql/resolver/expr/ob_raw_expr_replacer.h b/src/sql/resolver/expr/ob_raw_expr_replacer.h index b3c8d6e9c9..1a1fd07e27 100644 --- a/src/sql/resolver/expr/ob_raw_expr_replacer.h +++ b/src/sql/resolver/expr/ob_raw_expr_replacer.h @@ -26,8 +26,8 @@ namespace sql * it is replaced when visit ObQueryRefRawExpr; * 3. the replaced expr and its children will be skipped when traverse the expr tree, for example * with replace rule [{c1 -> c1+c2+1}, {c2 -> c1+c2+2}] - * select c1, c2 from t1 will be transfromed into select c1+c2+1, c1+c2+2 from t1 - * In constrast, ObTransformUtils::replace_expr will return OB_SIZE_OVERFLOW unexpectedly; + * select c1, c2 from t1 will be transformed into select c1+c2+1, c1+c2+2 from t1 + * In contrast, ObTransformUtils::replace_expr will return OB_SIZE_OVERFLOW unexpectedly; */ class ObRawExprReplacer: public ObRawExprVisitor { @@ -87,7 +87,7 @@ private: hash::ObHashMap expr_replace_map_; bool replace_happened_; - //If true, skip param epxrs which are resolved as flags instead of exprs in mysql. + //If true, skip param exprs which are resolved as flags instead of exprs in mysql. //(e.g. the second param of IS expr) bool skip_bool_param_mysql_; }; diff --git a/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp b/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp index ab0be2a1df..cf3756ab8f 100644 --- a/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp @@ -250,7 +250,7 @@ int ObRawExprResolverImpl::do_recursive_resolve(const ParseNode *node, ObRawExpr LOG_DEBUG("resolve item", "item_type", get_type_name(node->type_)); if (IS_DATATYPE_OR_QUESTIONMARK_OP(node->type_)) { if (OB_FAIL(process_datatype_or_questionmark(*node, expr))) { - LOG_WARN("fail to process datetype or questionmark", K(ret), K(node)); + LOG_WARN("fail to process datatype or questionmark", K(ret), K(node)); } } else { switch (node->type_) { @@ -599,7 +599,7 @@ int ObRawExprResolverImpl::do_recursive_resolve(const ParseNode *node, ObRawExpr case T_OP_REGEXP: case T_OP_NOT_REGEXP: { if (OB_FAIL(process_regexp_or_not_regexp_node(node, expr))) { - LOG_WARN("fail to process prgexp_or_not_pegexp node", K(ret), K(node)); + LOG_WARN("fail to process prgexp_or_not_regexp node", K(ret), K(node)); } break; } @@ -1012,7 +1012,7 @@ int ObRawExprResolverImpl::do_recursive_resolve(const ParseNode *node, ObRawExpr } case T_FUN_UDF: { ret = OB_ERR_UNEXPECTED; - LOG_ERROR("A BUG, Nerver Be Here!!!", K(ret)); + LOG_ERROR("A BUG, Never Be Here!!!", K(ret)); break; } case T_WINDOW_FUNCTION: { @@ -1546,7 +1546,7 @@ int ObRawExprResolverImpl::process_cursor_attr_node(const ParseNode &node, ObRaw } default: { ret = OB_ERR_UNEXPECTED; - LOG_WARN("invlid node type", K(node.children_[0]->type_)); + LOG_WARN("invalid node type", K(node.children_[0]->type_)); } } } @@ -1560,7 +1560,7 @@ int ObRawExprResolverImpl::process_cursor_attr_node(const ParseNode &node, ObRaw } if (OB_SUCC(ret)) { if (T_FUN_PL_GET_CURSOR_ATTR == c_expr->get_expr_type()) { - // 注意: 替换为ColumnRef的目的是为了在DML语句中把CURSOR%ROWID替换为QuenstionMark + // 注意: 替换为ColumnRef的目的是为了在DML语句中把CURSOR%ROWID替换为QuestionMark // 参见: ObDMLResolver::resolve_qualified_identifier ObQualifiedName column_ref; ObObjAccessIdent access_ident; @@ -1611,7 +1611,7 @@ int ObRawExprResolverImpl::process_obj_access_node(const ParseNode &node, ObRawE ObQualifiedName column_ref; int64_t child_start = ctx_.columns_->count(); if (OB_FAIL(resolve_obj_access_idents(node, column_ref))) { - LOG_WARN("resolve obj acess idents failed", K(ret)); + LOG_WARN("resolve obj access idents failed", K(ret)); } else { column_ref.format_qualified_name(ctx_.case_mode_); column_ref.parents_expr_info_ = ctx_.parents_expr_info_; @@ -1733,7 +1733,7 @@ int ObRawExprResolverImpl::process_sys_connect_by_path_node(const ParseNode *nod if (OB_ISNULL(node)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("unexpeced parameter", K(node), K(ret)); + LOG_WARN("unexpected parameter", K(node), K(ret)); } else if (OB_UNLIKELY(node->type_ != T_FUN_SYS_CONNECT_BY_PATH) || OB_UNLIKELY(node->num_child_ != 2) || OB_ISNULL(node->children_) @@ -2374,7 +2374,7 @@ int ObRawExprResolverImpl::process_connect_by_root_node(const ParseNode &node, O || OB_ISNULL(node.children_) || OB_UNLIKELY(node.type_ != T_OP_CONNECT_BY_ROOT)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("invalid parametor", K(node.num_child_), K(node.type_), K(ret)); + LOG_WARN("invalid parameter", K(node.num_child_), K(node.type_), K(ret)); } else if (OB_ISNULL(ctx_.stmt_) || OB_UNLIKELY(false == ctx_.stmt_->is_select_stmt())) { ret = OB_ERR_CBY_CONNECT_BY_REQUIRED; @@ -2540,7 +2540,7 @@ int ObRawExprResolverImpl::process_datatype_or_questionmark(const ParseNode &nod } else if (ctx_.is_for_dbms_sql_ || (ctx_.is_for_dynamic_sql_ && OB_NOT_NULL(session_info->get_pl_context()))){ //NOTICE: only need to process PL dynamic sql and dbms sql - /*dynmaic and dbms sql already prepare question mark in parse stage.*/ + /*dynamic and dbms sql already prepare question mark in parse stage.*/ bool need_save = true; for (int64_t i = 0; OB_SUCC(ret) && i < ctx_.external_param_info_->count(); ++i) { CK (OB_NOT_NULL(ctx_.external_param_info_->at(i).first)); @@ -3015,7 +3015,7 @@ int ObRawExprResolverImpl::process_any_or_all_node(const ParseNode *node, ObRawE LOG_WARN("resolve sub-query failed", K(ret)); } else if (OB_ISNULL(sub_expr)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("inavalid sub_expr", K(sub_expr)); + LOG_WARN("invalid sub_expr", K(sub_expr)); } else if (T_REF_QUERY == sub_expr->get_expr_type()) { ObQueryRefRawExpr *sub_ref = static_cast(sub_expr); sub_ref->set_is_set(true); @@ -3376,7 +3376,7 @@ int ObRawExprResolverImpl::process_regexp_or_not_regexp_node(const ParseNode *no ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid argument", K(ret), K(node)); } else if (OB_FAIL(process_node_with_children(node, num_child, t_expr))) { - LOG_WARN("fail to preocess node with children", K(ret)); + LOG_WARN("fail to process node with children", K(ret)); } else if (OB_ISNULL(t_expr)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("process node fail with invalid expr", K(ret), K(t_expr)); @@ -3677,7 +3677,7 @@ int ObRawExprResolverImpl::process_like_node(const ParseNode *node, ObRawExpr *& IS_NO_BACKSLASH_ESCAPES(ctx_.session_info_->get_sql_mode(), no_escapes); } if (OB_FAIL(process_datatype_or_questionmark(escape_node, escape_expr))) { - LOG_WARN("fail to resolver defalut excape node", K(ret)); + LOG_WARN("fail to resolver default excape node", K(ret)); } else if (OB_FAIL(t_expr->add_param_expr(escape_expr))) { LOG_WARN("fail to set param expr"); } else if (lib::is_oracle_mode() || no_escapes) { @@ -3844,7 +3844,7 @@ int ObRawExprResolverImpl::process_case_node(const ParseNode *node, ObRawExpr *& if (OB_ISNULL(node) || OB_UNLIKELY(3 != node->num_child_) || OB_UNLIKELY(T_CASE != node->type_) || OB_ISNULL(ctx_.session_info_)) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid PraseNode or session_info_", K(node), KP(ctx_.session_info_)); + LOG_WARN("invalid ParseNode or session_info_", K(node), KP(ctx_.session_info_)); } else if (OB_FAIL(ctx_.expr_factory_.create_raw_expr(T_INVALID, case_expr))) { LOG_WARN("fail to create raw expr", K(ret)); } else if (OB_ISNULL(case_expr)) { @@ -4148,7 +4148,7 @@ int ObRawExprResolverImpl::process_agg_node(const ParseNode *node, ObRawExpr *&e order_item.order_type_ = NULLS_FIRST_ASC; if (OB_FAIL(agg_expr->add_order_item(order_item))) { LOG_WARN("fail to add median order item", K(ret)); - } else {/* do nothong */} + } else {/* do nothing */} } } } else if (T_FUN_GROUPING_ID == node->type_) { @@ -4335,7 +4335,7 @@ int ObRawExprResolverImpl::process_group_aggr_node(const ParseNode *node, ObRawE LOG_WARN("store aggr expr failed", K(ret)); } else if (OB_ISNULL(node->children_)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("inalid group concat node", K(ret), K(node->children_)); + LOG_WARN("invalid group concat node", K(ret), K(node->children_)); } else { bool need_add_flag = !ctx_.parents_expr_info_.has_member(IS_AGG); ParseNode *expr_list_node = node->children_[1]; @@ -4976,7 +4976,7 @@ int ObRawExprResolverImpl::process_isnull_node(const ParseNode *node, ObRawExpr } else { ObRawExpr *obj_expr = NULL; if (OB_FAIL(SMART_CALL(recursive_resolve(node->children_[1]->children_[0], obj_expr)))) { - LOG_WARN("resolve child faield", K(ret)); + LOG_WARN("resolve child failed", K(ret)); } else if (OB_FAIL(ObRawExprUtils::build_is_not_null_expr(ctx_.expr_factory_, obj_expr, false/*is_not_null*/, @@ -5052,7 +5052,7 @@ int ObRawExprResolverImpl::process_sqlerrm_node(const ParseNode *node, ObRawExpr if (OB_ISNULL(node->children_[1]) || node->children_[1]->num_child_ != 1) { ret = OB_INVALID_ARGUMENT_NUM; - LOG_WARN("invlaid argument number for SQLERRM", K(node->children_[1]->num_child_)); + LOG_WARN("invalid argument number for SQLERRM", K(node->children_[1]->num_child_)); } if (OB_SUCC(ret)) { if (OB_ISNULL(node->children_[1]->children_[0])) { @@ -7442,7 +7442,7 @@ int ObRawExprResolverImpl::process_dll_udf_node(const ParseNode *node, ObRawExpr LOG_WARN("the udf info is null", K(ret)); } else if (!(udf_info->is_normal_udf() || udf_info->is_agg_udf())) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("the udf schame is error", K(ret), K(udf_info->get_type())); + LOG_WARN("the udf schema is error", K(ret), K(udf_info->get_type())); } else if (udf_info->is_normal_udf()) { ObSysFunRawExpr *func_expr = NULL; ObCharset::casedn(CS_TYPE_UTF8MB4_GENERAL_CI, udf_name); @@ -7824,4 +7824,4 @@ int ObRawExprResolverImpl::process_odbc_time_literals(const ObItemType dst_time_ } //namespace sql -} //namespace oceabase +} //namespace oceanbase diff --git a/src/sql/resolver/expr/ob_raw_expr_util.cpp b/src/sql/resolver/expr/ob_raw_expr_util.cpp index 5cce7dbf69..b92424802a 100644 --- a/src/sql/resolver/expr/ob_raw_expr_util.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_util.cpp @@ -895,7 +895,7 @@ int ObRawExprUtils::resolve_udf_param_exprs(ObResolverParams ¶ms, // 通过名字指定参数统一记录在param_names_和param_exprs里面, 所以这里一定相等 if (udf_info.param_names_.count() != udf_info.param_exprs_.count()) { ret = OB_ERR_UNEXPECTED; - SQL_LOG(WARN, "names array not equle to exprs array count", + SQL_LOG(WARN, "names array not equal to exprs array count", K(ret), K(udf_info.param_names_.count()), K(udf_info.param_exprs_.count())); } else if ((udf_info.udf_param_num_ + udf_info.param_names_.count()) > func_info->get_param_count()) { ret = OB_ERR_SP_WRONG_ARG_NUM; @@ -1701,7 +1701,7 @@ int ObRawExprUtils::build_seq_nextval_expr(ObRawExpr *&expr, } else if (OB_FAIL(func_expr->add_flag(IS_SEQ_EXPR))) { LOG_WARN("failed to add flag", K(ret)); } else if (OB_FAIL(func_expr->add_param_expr(col_id_expr))) { - LOG_WARN("set funcation param expr failed", K(ret)); + LOG_WARN("set function param expr failed", K(ret)); } else if (OB_FAIL(func_expr->formalize(session_info))) { LOG_WARN("failed to extract info", K(ret)); } else if (NULL != stmt && OB_FAIL(stmt->get_pseudo_column_like_exprs().push_back(func_expr))) { @@ -7123,7 +7123,7 @@ int ObRawExprUtils::build_dup_data_expr(ObRawExprFactory &factory, if (OB_SUCC(ret)) { if (OB_ISNULL(name = (char *)factory.get_allocator().alloc(pos + 2))) { ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_WARN("falied to allocate memory", K(ret)); + LOG_WARN("failed to allocate memory", K(ret)); } else { memcpy(name, name_buf, pos); name[pos] = ')'; diff --git a/src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp b/src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp index 650811d21e..2b91b10603 100644 --- a/src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp @@ -32,7 +32,7 @@ int ObRawExprWrapEnumSet::wrap_enum_set(ObDMLStmt &stmt) int ret = OB_SUCCESS; cur_stmt_ = &stmt; if (stmt.is_select_stmt()) { - //handle the targest list of first level + //handle the target list of first level ObSelectStmt &select_stmt = static_cast(stmt); if (OB_FAIL(wrap_target_list(select_stmt))) { LOG_WARN("failed to wrap target list", K(ret)); diff --git a/src/sql/resolver/prepare/ob_deallocate_resolver.cpp b/src/sql/resolver/prepare/ob_deallocate_resolver.cpp index 2c1dd21026..d084a161a4 100644 --- a/src/sql/resolver/prepare/ob_deallocate_resolver.cpp +++ b/src/sql/resolver/prepare/ob_deallocate_resolver.cpp @@ -40,7 +40,7 @@ int ObDeallocateResolver::resolve(const ParseNode &parse_tree) ObString name(parse_tree.children_[0]->str_len_, parse_tree.children_[0]->str_value_); ObPsStmtId ps_id = OB_INVALID_ID; if (OB_FAIL(ob_simple_low_to_up(*params_.allocator_, name, stmt_name))) { - LOG_WARN("failed to write stirng", K(ret)); + LOG_WARN("failed to write string", K(ret)); } else if(OB_FAIL(session_info_->get_prepare_id(stmt_name, ps_id))) { LOG_WARN("failed to get prepare id", K(ret)); } else { diff --git a/src/sql/resolver/prepare/ob_execute_resolver.cpp b/src/sql/resolver/prepare/ob_execute_resolver.cpp index 1fe915e241..e796029c98 100644 --- a/src/sql/resolver/prepare/ob_execute_resolver.cpp +++ b/src/sql/resolver/prepare/ob_execute_resolver.cpp @@ -49,7 +49,7 @@ int ObExecuteResolver::resolve(const ParseNode &parse_tree) ObPsStmtId ps_id = OB_INVALID_ID; stmt::StmtType ps_type = stmt::T_NONE; if (OB_FAIL(ob_simple_low_to_up(*params_.allocator_, name, stmt_name))) { - LOG_WARN("failed to write stirng", K(ret)); + LOG_WARN("failed to write string", K(ret)); } else if(OB_FAIL(session_info_->get_prepare_id(stmt_name, ps_id))) { LOG_WARN("failed to get prepare id", K(ret)); } else if (OB_FAIL(session_info_->get_ps_session_info(ps_id, ps_session_info))) { @@ -76,7 +76,7 @@ int ObExecuteResolver::resolve(const ParseNode &parse_tree) for(int32_t i = 0; OB_SUCC(ret) && i < arguments->num_child_; ++i) { if (OB_ISNULL(arguments->children_[i])) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid argumenet", K(arguments->children_[i]), K(ret)); + LOG_WARN("invalid argument", K(arguments->children_[i]), K(ret)); } else { ObRawExpr *param_expr = NULL; if (OB_FAIL(ObResolverUtils::resolve_const_expr(params_, *arguments->children_[i], param_expr, NULL))) {