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

fix variable server_uuid isn't correctly and master failed cases

Browse Source
This commit is contained in:
wangt1xiuyi
2023-07-05 07:54:03 +00:00
committed by ob-robot
parent cea8a51d2b
commit 3943420210
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/engine/expr/ob_expr_uuid.cpp
View File

@ -390,15 +390,31 @@ int ObExprSysGuid::eval_sys_guid(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &ex
int ObExprUuid::gen_server_uuid(char *server_uuid, const int64_t uuid_len) int ObExprUuid::gen_server_uuid(char *server_uuid, const int64_t uuid_len)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObArenaAllocator calc_buf(ObModIds::OB_SQL_EXPR); ObArenaAllocator calc_buf("ServerUuid");
unsigned char scratch[UuidCommon::LENGTH_UUID] = {0}; unsigned char scratch[UuidCommon::LENGTH_UUID] = {0};
if (OB_ISNULL(server_uuid) || OB_UNLIKELY(uuid_len != UuidCommon::LENGTH_UUID)) { bool need_reset = false;
if (OB_ISNULL(uuid_node)) {
need_reset = true;
if (OB_ISNULL(uuid_node = static_cast<ObUUIDNode*>(calc_buf.alloc(sizeof(ObUUIDNode))))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret));
} else if (OB_FAIL(uuid_node->init())) {
LOG_WARN("failed to init", K(ret));
}
}
if (OB_FAIL(ret)) {
//do nothing
} else if (OB_ISNULL(server_uuid) || OB_UNLIKELY(uuid_len != UuidCommon::LENGTH_UUID)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected error", K(ret), K(server_uuid), K(uuid_len)); LOG_WARN("get unexpected error", K(ret), K(server_uuid), K(uuid_len));
} else if (OB_FAIL(calc(scratch))) { } else if (OB_FAIL(calc(scratch))) {
LOG_WARN("failed to calc", K(ret)); LOG_WARN("failed to calc", K(ret));
} else if (OB_FAIL(UuidCommon::bin2uuid(server_uuid, scratch))) { } else if (OB_FAIL(UuidCommon::bin2uuid(server_uuid, scratch))) {
LOG_WARN("fail to convert strach to server_uuid", K(ret), K(server_uuid), K(scratch)); LOG_WARN("fail to convert strach to server_uuid", K(ret), K(server_uuid), K(scratch));
} else {/*do nothing*/}
if (need_reset) {
uuid_node = NULL;
} }
return ret; return ret;
} }