hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix some bugs

Browse Source
This commit is contained in:
chimyue
2023-08-02 09:48:28 +00:00
committed by ob-robot
parent 8c3f8a4df7
commit a9decfb7e1
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/observer/mysql/obmp_query.cpp
View File

@ -326,7 +326,7 @@ int ObMPQuery::process()
//FIXME qianfu NG_TRACE_EXT(set_disconnect, OB_ID(disconnect), true, OB_ID(pos), "multi stmt begin");
if (OB_UNLIKELY(parse_stat.parse_fail_
&& (i == parse_stat.fail_query_idx_)
&& (OB_ERR_PARSE_SQL != parse_stat.fail_ret_))) {
&& ObSQLUtils::check_need_disconnect_parser_err(parse_stat.fail_ret_))) {
// 进入本分支，说明在multi_query中的某条query parse失败，如果不是语法错，则进入该分支
// 如果当前query_count 为1， 则不断连接;如果大于1，
// 则需要在发错误包之后断连接，防止客户端一直在等接下来的回包

2
src/observer/mysql/obmp_stmt_prepare.cpp
View File

@ -128,7 +128,7 @@ int ObMPStmtPrepare::multiple_query_check(ObSQLSessionInfo &session,
LOG_WARN("can't not prepare multi stmt", K(ret), K(queries.count()));
} else {
if (OB_UNLIKELY(parse_stat.parse_fail_ && (0 == parse_stat.fail_query_idx_)
&& (OB_ERR_PARSE_SQL != parse_stat.fail_ret_))) {
&& ObSQLUtils::check_need_disconnect_parser_err(parse_stat.fail_ret_))) {
// 进入本分支，说明在multi_query中的某条query parse失败，如果不是语法错，则进入该分支
// 如果当前query_count 为1， 则不断连接;如果大于1，
// 则需要在发错误包之后断连接，防止客户端一直在等接下来的回包

6
src/observer/virtual_table/ob_all_virtual_diag_index_scan.cpp
View File

@ -34,8 +34,10 @@ int ObAllVirtualDiagIndexScan::set_index_ids(const common::ObIArray<common::ObNe
start_key_obj_ptr = start_key.get_obj_ptr();
end_key_obj_ptr = end_key.get_obj_ptr();
if (NULL != start_key_obj_ptr && NULL != end_key_obj_ptr) {
if ((!start_key_obj_ptr[0].is_min_value() || !end_key_obj_ptr[0].is_max_value())
&& start_key_obj_ptr[0] != end_key_obj_ptr[0]) {
if (start_key_obj_ptr[0].is_max_value() && end_key_obj_ptr[0].is_min_value()) {
/* do nothing for always false range */
} else if ((!start_key_obj_ptr[0].is_min_value() || !end_key_obj_ptr[0].is_max_value())
&& start_key_obj_ptr[0] != end_key_obj_ptr[0]) {
ret = OB_NOT_IMPLEMENT;
SERVER_LOG(ERROR, "index id should be exact value", K(ret));
} else if (start_key_obj_ptr[0] == end_key_obj_ptr[0]) {

2
tools/deploy/mysql_test/include/explain_end.inc
View File

@ -1,8 +1,6 @@
connect (obsys_explain,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
connection obsys_explain;
--disable_query_log
alter system set_tp tp_no = 509, error_code = 0, frequency = 1;
alter system set_tp tp_no = 368, error_code = 0, frequency = 1;
alter system set_tp tp_no = 918, error_code = 0, frequency = 1;
--enable_query_log
disconnect obsys_explain;

2
tools/deploy/mysql_test/include/explain_init.inc
View File

@ -1,8 +1,6 @@
connect (obsys_explain,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
connection obsys_explain;
--disable_query_log
alter system set_tp tp_no = 509, error_code = 4016, frequency = 1;
alter system set_tp tp_no = 368, error_code = 4016, frequency = 1;
alter system set_tp tp_no = 918, error_code = 4016, frequency = 1;
--enable_query_log
disconnect obsys_explain;