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

fix drop_partition_info swallow error code since 2_2_x

Browse Source
This commit is contained in:
obdev
2023-04-24 02:41:14 +00:00
committed by ob-robot
parent 27657e795b
commit 610f5a50d4
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
deps/easy/src/io/easy_negotiation.c vendored
View File

@ -61,9 +61,9 @@ static int easy_encode_uint64(char *buf, const uint64_t buf_len, int64_t *pos, u
} }
static int easy_encode_uint16(char *buf, const uint64_t buf_len, int64_t *pos, uint16_t val) static int easy_encode_uint16(char *buf, const uint64_t buf_len, int64_t *pos, uint16_t val)
{ {
int ret = ((NULL != buf) && int ret = ((NULL != buf) &&
((buf_len - *pos) >= (uint64_t)(sizeof(val)))) ? EASY_OK : EASY_ABORT; ((buf_len - *pos) >= (uint64_t)(sizeof(val)))) ? EASY_OK : EASY_ABORT;
if (EASY_OK == ret) { if (EASY_OK == ret) {
*(buf + (*pos)++) = (char)((((val) >> 8)) & 0xff); *(buf + (*pos)++) = (char)((((val) >> 8)) & 0xff);
@ -167,9 +167,9 @@ static int easy_decode_negotiation_msg(easy_negotiation_msg_t *ne_msg, char *rec
pos++; //for io thread index pos++; //for io thread index
*decode_len = pos; *decode_len = pos;
return ret; return ret;
} }
/* /*
* easy negotiation packet format * easy negotiation packet format
@ -273,9 +273,9 @@ void net_consume_negotiation_msg(int fd, uint64_t magic)
easy_info_log("not negotiation msg ! return!"); easy_info_log("not negotiation msg ! return!");
} }
} }
return; return;
} }
int easy_send_negotiate_message(easy_connection_t *c) int easy_send_negotiate_message(easy_connection_t *c)
{ {

2
src/share/schema/ob_partition_sql_helper.cpp
View File

@ -1459,7 +1459,6 @@ int ObDropIncPartHelper::drop_partition_info()
if (OB_SUCC(ret) && inc_part_num > 0) { if (OB_SUCC(ret) && inc_part_num > 0) {
int64_t affected_rows = 0; int64_t affected_rows = 0;
if (OB_FAIL(sql_client_.write(exec_tenant_id, part_history_sql.ptr(), affected_rows))) { if (OB_FAIL(sql_client_.write(exec_tenant_id, part_history_sql.ptr(), affected_rows))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("execute sql failed", K(ret), K(part_history_sql)); LOG_WARN("execute sql failed", K(ret), K(part_history_sql));
} else if (affected_rows != inc_part_num) { } else if (affected_rows != inc_part_num) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -1530,7 +1529,6 @@ int ObDropIncSubPartHelper::drop_subpartition_info()
if (OB_SUCC(ret) && inc_sub_part_num > 0) { if (OB_SUCC(ret) && inc_sub_part_num > 0) {
int64_t affected_rows = 0; int64_t affected_rows = 0;
if (OB_FAIL(sql_client_.write(exec_tenant_id, sub_part_history_sql.ptr(), affected_rows))) { if (OB_FAIL(sql_client_.write(exec_tenant_id, sub_part_history_sql.ptr(), affected_rows))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("execute sql failed", K(ret), K(sub_part_history_sql)); LOG_WARN("execute sql failed", K(ret), K(sub_part_history_sql));
} else if (affected_rows != inc_sub_part_num) { } else if (affected_rows != inc_sub_part_num) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;