misc refinement
This commit is contained in:
1
deps/oblib/src/lib/ob_name_def.h
vendored
1
deps/oblib/src/lib/ob_name_def.h
vendored
@ -625,6 +625,7 @@
|
||||
#define N_JOIN_INFO "join_info"
|
||||
#define N_ID_SET "id_set"
|
||||
#define N_CURRENT_SCN "current_scn"
|
||||
#define N_TRANSACTION_ID "ob_transaction_id"
|
||||
#define N_EQUAL_SET "equal_set"
|
||||
#define N_LEFT_ID "left_id"
|
||||
#define N_RIGHT_ID "right_id"
|
||||
|
||||
2
deps/oblib/src/rpc/obmysql/ob_sql_nio.cpp
vendored
2
deps/oblib/src/rpc/obmysql/ob_sql_nio.cpp
vendored
@ -844,7 +844,7 @@ public:
|
||||
LOG_TRACE("revert_sock: sock still readable", K(*s));
|
||||
int ret = OB_SUCCESS;
|
||||
if (OB_FAIL(handler_.on_readable(s->sess_))) {
|
||||
LOG_TRACE("push to omt queue fail", K(ret), K(*s));
|
||||
LOG_WARN("push to omt queue fail, will close socket", K(ret), K(*s));
|
||||
push_close_req(s);
|
||||
s->disable_may_handling_flag();
|
||||
}
|
||||
|
||||
@ -131,17 +131,17 @@ int ObSqlSockHandler::on_readable(void* udata)
|
||||
ret = OB_INVALID_ARGUMENT;
|
||||
LOG_ERROR("sess is null!", K(ret));
|
||||
} else if (OB_FAIL(sock_processor_.decode_sql_packet(sess->pool_, *sess, NULL, pkt))) {
|
||||
LOG_WARN("decode sql req fail", K(ret));
|
||||
LOG_WARN("decode sql req fail", K(ret), K(sess->sql_session_id_));
|
||||
} else if (NULL == pkt) {
|
||||
sess->revert_sock();
|
||||
} else if (OB_FAIL(sock_processor_.build_sql_req(*sess, pkt, sql_req))) {
|
||||
LOG_WARN("build sql req fail", K(ret));
|
||||
LOG_WARN("build sql req fail", K(ret), K(sess->sql_session_id_));
|
||||
}
|
||||
|
||||
if (OB_SUCCESS != ret || NULL == sql_req) {
|
||||
} else if (FALSE_IT(sess->set_last_decode_succ_and_deliver_time(ObTimeUtility::current_time()))) {
|
||||
} else if (OB_FAIL(deliver_->deliver(*sql_req))) {
|
||||
LOG_WARN("deliver sql request fail", K(ret));
|
||||
LOG_WARN("deliver sql request fail", K(ret), K(sess->sql_session_id_));
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user