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

fix erase interm result with errno 4201

Browse Source
This commit is contained in:
obdev
2023-05-11 02:34:05 +00:00
committed by ob-robot
parent 1c0685460b
commit 6672b68e98
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/detect/ob_detect_manager.cpp
View File

@ -276,8 +276,8 @@ int ObDetectManager::unregister_check_item(const ObDetectableId &detectable_id,
if (OB_FAIL(all_check_items_.erase_if(detectable_id, remove_node_call, is_erased))) { if (OB_FAIL(all_check_items_.erase_if(detectable_id, remove_node_call, is_erased))) {
if (OB_HASH_NOT_EXIST == ret) { if (OB_HASH_NOT_EXIST == ret) {
// if not found, the possible reason is that node is removed by ObDetectCallbackNodeExecuteCall // if not found, the possible reason is that node is removed by ObDetectCallbackNodeExecuteCall
LIB_LOG(WARN, "[DM] unregister cb failed, maybe removed by other thread", LIB_LOG(TRACE, "[DM] unregister cb failed, maybe removed by other thread",
K(ret), K(detectable_id), K(node_sequence_id)); K(detectable_id), K(node_sequence_id));
} else { } else {
LIB_LOG(WARN, "[DM] unregister cb failed", K(ret), K(detectable_id), K(node_sequence_id)); LIB_LOG(WARN, "[DM] unregister cb failed", K(ret), K(detectable_id), K(node_sequence_id));
} }

7
src/sql/engine/basic/ob_temp_table_transformation_op.cpp
View File

@ -233,7 +233,12 @@ int ObTempTableTransformationOp::destory_local_interm_results(ObIArray<uint64_t>
dtl_int_key.channel_id_ = result_ids.at(i); dtl_int_key.channel_id_ = result_ids.at(i);
if (OB_FAIL(dtl::ObDTLIntermResultManager::getInstance().erase_interm_result_info( if (OB_FAIL(dtl::ObDTLIntermResultManager::getInstance().erase_interm_result_info(
dtl_int_key))) { dtl_int_key))) {
LOG_WARN("failed to erase interm result info in manager.", K(ret)); if (OB_HASH_NOT_EXIST == ret) {
ret = OB_SUCCESS;
LOG_WARN("interm result may erased by DM", K(ret));
} else {
LOG_WARN("failed to erase interm result info in manager.", K(ret));
}
} }
} }
return ret; return ret;