Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some type err #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix some type err #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1951c17
fix some type err
xiaoleizi2016 Dec 27, 2023
66046fe
distinguish various calc param expr type
xiaoleizi2016 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/obproxy/obutils/ob_proxy_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/obproxy/opsql/func_expr_resolver/proxy_expr/ob_proxy_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/obproxy/proxy/mysql/ob_mysql_sm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/obproxy/proxy/mysqllib/ob_mysql_request_analyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down