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

fix errism complie problem

Browse Source
This commit is contained in:
obdev
2024-04-17 08:00:24 +00:00
committed by ob-robot
parent 0e45fe3bf4
commit 1549721801
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/lib/utility/ob_tracepoint_def.h vendored
View File

@ -346,6 +346,7 @@ GLOBAL_ERRSIM_POINT_DEF(514, EN_DDL_RELEASE_DDL_KV_FAIL, "");
GLOBAL_ERRSIM_POINT_DEF(515, EN_DDL_REPORT_CHECKSUM_FAIL, ""); GLOBAL_ERRSIM_POINT_DEF(515, EN_DDL_REPORT_CHECKSUM_FAIL, "");
GLOBAL_ERRSIM_POINT_DEF(516, EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL, ""); GLOBAL_ERRSIM_POINT_DEF(516, EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL, "");
GLOBAL_ERRSIM_POINT_DEF(517, EN_DDL_DIRECT_LOAD_WAIT_TABLE_LOCK_FAIL, ""); GLOBAL_ERRSIM_POINT_DEF(517, EN_DDL_DIRECT_LOAD_WAIT_TABLE_LOCK_FAIL, "");
GLOBAL_ERRSIM_POINT_DEF(518, EN_DDL_LOBID_CACHE_SIZE_INJECTED, "");
// SQL Optimizer related 551-599 // SQL Optimizer related 551-599
GLOBAL_ERRSIM_POINT_DEF(551, EN_EXPLAIN_GENERATE_PLAN_WITH_OUTLINE, "Used to enable outline validity check for explain query"); GLOBAL_ERRSIM_POINT_DEF(551, EN_EXPLAIN_GENERATE_PLAN_WITH_OUTLINE, "Used to enable outline validity check for explain query");

2
src/sql/engine/px/p2p_datahub/ob_p2p_dh_msg.cpp
View File

@ -140,7 +140,7 @@ int ObP2PDatahubMsgBase::process_msg_internal(bool &need_free)
need_merge = false; // set success, not need to merge need_merge = false; // set success, not need to merge
int reg_dm_ret = OB_SUCCESS; int reg_dm_ret = OB_SUCCESS;
#ifdef ERRSIM #ifdef ERRSIM
int reg_dm_ret = OB_E(EventTable::EN_PX_P2P_MSG_REG_DM_FAILED) OB_SUCCESS; reg_dm_ret = OB_E(EventTable::EN_PX_P2P_MSG_REG_DM_FAILED) OB_SUCCESS;
if (OB_SUCCESS != reg_dm_ret) { if (OB_SUCCESS != reg_dm_ret) {
LOG_WARN("p2p msg reg dm failed by design", K(ret)); LOG_WARN("p2p msg reg dm failed by design", K(ret));
reg_dm_ret = OB_ALLOCATE_MEMORY_FAILED; reg_dm_ret = OB_ALLOCATE_MEMORY_FAILED;

2
src/sql/engine/px/p2p_datahub/ob_runtime_filter_msg.cpp
View File

@ -245,7 +245,7 @@ int ObRFBloomFilterMsg::process_msg_internal(bool &need_free)
need_merge = false; // set success, not need to merge need_merge = false; // set success, not need to merge
int reg_dm_ret = OB_SUCCESS; int reg_dm_ret = OB_SUCCESS;
#ifdef ERRSIM #ifdef ERRSIM
int reg_dm_ret = OB_E(EventTable::EN_PX_P2P_MSG_REG_DM_FAILED) OB_SUCCESS; reg_dm_ret = OB_E(EventTable::EN_PX_P2P_MSG_REG_DM_FAILED) OB_SUCCESS;
if (OB_SUCCESS != reg_dm_ret) { if (OB_SUCCESS != reg_dm_ret) {
LOG_WARN("p2p msg reg dm failed by design", K(ret)); LOG_WARN("p2p msg reg dm failed by design", K(ret));
reg_dm_ret = OB_ALLOCATE_MEMORY_FAILED; reg_dm_ret = OB_ALLOCATE_MEMORY_FAILED;