From 4aea96261615854b7924c3de0ffc85c81412e7f0 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Sat, 2 Mar 2024 09:00:26 +0000 Subject: [PATCH 1/2] update storage/tianchi/ctc_meta_data.cc. Signed-off-by: xuyongliang_01 --- storage/tianchi/ctc_meta_data.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/storage/tianchi/ctc_meta_data.cc b/storage/tianchi/ctc_meta_data.cc index 7b601de..ff4197a 100644 --- a/storage/tianchi/ctc_meta_data.cc +++ b/storage/tianchi/ctc_meta_data.cc @@ -207,7 +207,7 @@ typename std::enable_if::type MDL_REQUEST_INIT_BY_KEY(&mdl_request, &mdl_key, MDL_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_ROUTINE]: acquire routine/procedure mdl fail. schema_name:%s, routine_name:%s", schema_name, routine_name); + tse_log_error("[INVALIDATE_ROUTINE]: fail to acquire routine/procedure mdl . schema_name:%s, routine_name:%s", schema_name, routine_name); return true; } routine_ticket = mdl_request.ticket; @@ -265,7 +265,7 @@ typename std::enable_if::type MDL_INTENTION_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLE]: acquire schema mdl lock fail. schema:%s, table:%s ", schema_name, table_name); + tse_log_error("[INVALIDATE_TABLE]: fail to acquire schema mdl lock . schema:%s, table:%s ", schema_name, table_name); return true; } schema_ticket = mdl_request.ticket; @@ -278,7 +278,7 @@ typename std::enable_if::type MDL_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLE]: acquire table mdl lock fail. schema:%s, table:%s ", schema_name, table_name); + tse_log_error("[INVALIDATE_TABLE]: fail to acquire table mdl lock . schema:%s, table:%s ", schema_name, table_name); return true; } table_ticket = mdl_request.ticket; @@ -316,7 +316,7 @@ typename std::enable_if::type if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_SCHEMA]: acquire schema(%s) mdl lock fail.", schema_name); + tse_log_error("[INVALIDATE_SCHEMA]: fail to acquire schema(%s) mdl lock .", schema_name); return true; } schema_ticket = mdl_request.ticket; @@ -354,7 +354,7 @@ typename std::enable_if::type if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLESPACE]: acquire tablespace mdl lock fail. tablespace_name:%s", tablespace_name); + tse_log_error("[INVALIDATE_TABLESPACE]: fail to acquire tablespace mdl lock . tablespace_name:%s", tablespace_name); return true; } tablespace_ticket = mdl_request.ticket; @@ -514,7 +514,7 @@ int tse_mdl_lock_thd(tianchi_handler_t *tch, tse_lock_table_info *lock_info, int if (thd->mdl_context.acquire_lock(&tse_mdl_request, 10)) { *err_code = ER_LOCK_WAIT_TIMEOUT; - tse_log_error("[TSE_MDL_LOCK]:Get mdl lock fail. namespace:%d, db_name:%s, table_name:%s", + tse_log_error("[TSE_MDL_LOCK]:fail to get mdl lock . namespace:%d, db_name:%s, table_name:%s", lock_info->mdl_namespace, lock_info->db_name, lock_info->table_name); return true; } -- Gitee From e26c3f36b34011b515c790a02b67b3898c601e69 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 4 Mar 2024 06:44:03 +0000 Subject: [PATCH 2/2] update storage/tianchi/ctc_meta_data.cc. Signed-off-by: xuyongliang_01 --- storage/tianchi/ctc_meta_data.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/storage/tianchi/ctc_meta_data.cc b/storage/tianchi/ctc_meta_data.cc index ff4197a..8a51f2f 100644 --- a/storage/tianchi/ctc_meta_data.cc +++ b/storage/tianchi/ctc_meta_data.cc @@ -207,7 +207,7 @@ typename std::enable_if::type MDL_REQUEST_INIT_BY_KEY(&mdl_request, &mdl_key, MDL_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_ROUTINE]: fail to acquire routine/procedure mdl . schema_name:%s, routine_name:%s", schema_name, routine_name); + tse_log_error("[INVALIDATE_ROUTINE]: Failed to acquire routine/procedure mdl of schema_name:%s and routine_name:%s", schema_name, routine_name); return true; } routine_ticket = mdl_request.ticket; @@ -265,7 +265,7 @@ typename std::enable_if::type MDL_INTENTION_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLE]: fail to acquire schema mdl lock . schema:%s, table:%s ", schema_name, table_name); + tse_log_error("[INVALIDATE_TABLE]: Failed to acquire schema mdl lock of schema:%s and table:%s ", schema_name, table_name); return true; } schema_ticket = mdl_request.ticket; @@ -278,7 +278,7 @@ typename std::enable_if::type MDL_EXCLUSIVE, MDL_EXPLICIT); if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLE]: fail to acquire table mdl lock . schema:%s, table:%s ", schema_name, table_name); + tse_log_error("[INVALIDATE_TABLE]: Failed to acquire table mdl lock of schema:%s and table:%s ", schema_name, table_name); return true; } table_ticket = mdl_request.ticket; @@ -316,7 +316,7 @@ typename std::enable_if::type if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_SCHEMA]: fail to acquire schema(%s) mdl lock .", schema_name); + tse_log_error("[INVALIDATE_SCHEMA]: Failed to acquire schema(%s) mdl lock .", schema_name); return true; } schema_ticket = mdl_request.ticket; @@ -354,7 +354,7 @@ typename std::enable_if::type if (thd->mdl_context.acquire_lock(&mdl_request, CTC_MDL_TIMEOUT)) { assert(thd->killed || thd->is_error()); - tse_log_error("[INVALIDATE_TABLESPACE]: fail to acquire tablespace mdl lock . tablespace_name:%s", tablespace_name); + tse_log_error("[INVALIDATE_TABLESPACE]: Failed to acquire tablespace mdl lock of tablespace_name:%s", tablespace_name); return true; } tablespace_ticket = mdl_request.ticket; @@ -514,7 +514,7 @@ int tse_mdl_lock_thd(tianchi_handler_t *tch, tse_lock_table_info *lock_info, int if (thd->mdl_context.acquire_lock(&tse_mdl_request, 10)) { *err_code = ER_LOCK_WAIT_TIMEOUT; - tse_log_error("[TSE_MDL_LOCK]:fail to get mdl lock . namespace:%d, db_name:%s, table_name:%s", + tse_log_error("[TSE_MDL_LOCK]:Failed to get mdl lock of namespace:%d , db_name:%s and table_name:%s", lock_info->mdl_namespace, lock_info->db_name, lock_info->table_name); return true; } -- Gitee