diff --git a/src/obproxy/obutils/ob_proxy_config.h b/src/obproxy/obutils/ob_proxy_config.h index 2f90d511..8a29dac5 100644 --- a/src/obproxy/obutils/ob_proxy_config.h +++ b/src/obproxy/obutils/ob_proxy_config.h @@ -444,7 +444,7 @@ class ObProxyConfig : public common::ObCommonConfig DEF_BOOL(auto_scan_all, "false", "if enabled, need scan all", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); // session pool - DEF_BOOL(is_pool_mode, "false", "if enabled means useing session pool", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); + DEF_BOOL(is_pool_mode, "false", "if enabled means using session pool", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_conn_precreate, "false", "if enabled means precreate conn for session pool", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_session_pool_for_no_sharding, "false", "if enabled can use session pool for no sharding", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_no_sharding_skip_real_conn, "false", "if enabled no sharding will use saved password check to skip real conn", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); diff --git a/src/obproxy/opsql/func_expr_resolver/proxy_expr/ob_proxy_expr.cpp b/src/obproxy/opsql/func_expr_resolver/proxy_expr/ob_proxy_expr.cpp index 323a9a14..4bd69e16 100644 --- a/src/obproxy/opsql/func_expr_resolver/proxy_expr/ob_proxy_expr.cpp +++ b/src/obproxy/opsql/func_expr_resolver/proxy_expr/ob_proxy_expr.cpp @@ -434,7 +434,7 @@ int ObProxyExprHash::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("hash should have one or two param", K(ret)); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("hash calc param expr failed", K(ret)); } else { int i = 0; do { @@ -522,7 +522,7 @@ int ObProxyExprSubStr::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("substr has no param", K(ret)); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("substr calc param expr failed", K(ret)); } else { int i = 0; do { @@ -652,7 +652,7 @@ int ObProxyExprConcat::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("concat has no param", K(ret)); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("concat calc param expr failed", K(ret)); } else { int i = 0; do { @@ -1506,7 +1506,7 @@ int ObProxyExprToTimeHandler::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("to_date should have at least one param", K(ret)); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("to_date calc param expr failed", K(ret)); } else { int i = 0; do { @@ -1588,7 +1588,7 @@ int ObProxyExprNvl::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("nvl should have two param", K(ret)); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("nvl calc param expr failed", K(ret)); } else { int i = 0; do { @@ -1650,7 +1650,7 @@ int ObProxyExprToChar::calc(const ObProxyExprCtx &ctx, ret = OB_EXPR_CALC_ERROR; LOG_WARN("to_char should have one or two param", K(ret), K(param_array_.count())); } else if (OB_FAIL(calc_param_expr(ctx, calc_item, param_result_array, cnt))) { - LOG_WARN("calc param expr failed", K(ret)); + LOG_WARN("to_char calc param expr failed", K(ret)); } else { int i = 0; do { diff --git a/src/obproxy/proxy/mysql/ob_mysql_sm.cpp b/src/obproxy/proxy/mysql/ob_mysql_sm.cpp index d7656b11..160dcc8d 100644 --- a/src/obproxy/proxy/mysql/ob_mysql_sm.cpp +++ b/src/obproxy/proxy/mysql/ob_mysql_sm.cpp @@ -836,7 +836,7 @@ int ObMysqlSM::state_client_request_read(int event, void *data) client_session_->active_ = true; MYSQL_INCREMENT_DYN_STAT(CURRENT_ACTIVE_CLIENT_CONNECTIONS); } - // do not warry about cluster resource, large request will allways behind + // do not warry about cluster resource, large request will always behind // the auth request. call_transact_and_set_next_state(ObMysqlTransact::modify_request); diff --git a/src/obproxy/proxy/mysqllib/ob_mysql_request_analyzer.cpp b/src/obproxy/proxy/mysqllib/ob_mysql_request_analyzer.cpp index b95aa448..afb77b38 100644 --- a/src/obproxy/proxy/mysqllib/ob_mysql_request_analyzer.cpp +++ b/src/obproxy/proxy/mysqllib/ob_mysql_request_analyzer.cpp @@ -359,7 +359,7 @@ inline int ObMysqlRequestAnalyzer::handle_auth_request(ObIOBufferReader &reader, } } else { ret = OB_ERR_UNEXPECTED; - LOG_WARN("it shoulde not happened", K(ret)); + LOG_WARN("it should not happened", K(ret)); } return ret; }