From 9f37cab4590fa55ceedf59acf161b60eda8ade44 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: Thu, 29 Feb 2024 11:06:29 +0800 Subject: [PATCH] Match-id-105dc07ab3eeb216d74bd89a6f019803fe98a468 --- storage/tianchi/ctc_meta_data.cc | 38 +--------------------------- storage/tianchi/srv_mq_msg.h | 11 -------- storage/tianchi/tse_srv.h | 2 -- storage/tianchi/tse_srv_mq_module.cc | 17 +------------ 4 files changed, 2 insertions(+), 66 deletions(-) diff --git a/storage/tianchi/ctc_meta_data.cc b/storage/tianchi/ctc_meta_data.cc index d8cc8cd..3cf11be 100644 --- a/storage/tianchi/ctc_meta_data.cc +++ b/storage/tianchi/ctc_meta_data.cc @@ -176,8 +176,7 @@ static void release_tse_mdl_thd_by_inst_id(uint32_t mysql_inst_id) { static void ctc_init_thd(THD **thd, uint64_t thd_key) { lock_guard lock(m_tse_mdl_thd_mutex); - uint64_t bypass_key = tse_get_conn_key((uint32)0xFFFFFFFF - 1, (uint32)0xFFFFFFFF - 1, true); - if (g_tse_mdl_thd_map.find(thd_key) != g_tse_mdl_thd_map.end() && thd_key != bypass_key) { + if (g_tse_mdl_thd_map.find(thd_key) != g_tse_mdl_thd_map.end()) { (*thd) = g_tse_mdl_thd_map[thd_key]; my_thread_init(); (*thd)->store_globals(); @@ -401,27 +400,6 @@ typename std::enable_if::type return false; } -int tse_update_mysql_dd_cache(char *sql_str) { - // 判断一下是不是slave—cluster，并且是归一。 - if ((!IS_METADATA_NORMALIZATION())) { - tse_log_error("Do not try to invalidate all local dd cache in metadata_normalization mode or primary_cluster."); - return -1; - } - // 获取一个thd - THD *thd = nullptr; - uint64_t thd_key = tse_get_conn_key((uint32)0xFFFFFFFF - 1, (uint32)0xFFFFFFFF - 1, true); - ctc_init_thd(&thd, thd_key); - - //清空dcl的cache - reload_acl_caches(thd, false); - - // 拿到Client dd cache, 清空 - // 拿到Shared dd cache，清空 - int ret = dd::execute_query(thd, dd::String_type((const char*)sql_str)); - tse_log_system("Tse update mysql dd cache, the sql: %s, ret:%d", sql_str, ret); - return false; -} - template static typename std::enable_if::type tse_invalidate_mysql_dd_cache_impl(tianchi_handler_t *tch, tse_invalidate_broadcast_request *broadcast_req, int *err_code) { @@ -500,20 +478,6 @@ static typename std::enable_if::typ return 0; } -int tse_invalidate_all_dd_cache() { - THD *thd = nullptr; - uint64_t thd_key = tse_get_conn_key((uint32)0xFFFFFFFF - 1, (uint32)0xFFFFFFFF - 1, true); - ctc_init_thd(&thd, thd_key); - -#ifdef METADATA_NORMALIZED - dd::cache::Shared_dictionary_cache::instance()->reset(true); - int not_used; - handle_reload_request(thd, (REFRESH_TABLES | REFRESH_FAST | REFRESH_THREADS), nullptr, ¬_used); - tse_log_system("[zzh debug] handle_reload_request finished."); -#endif - return 0; -} - int tse_invalidate_mysql_dd_cache(tianchi_handler_t *tch, tse_invalidate_broadcast_request *broadcast_req, int *err_code) { return (int)tse_invalidate_mysql_dd_cache_impl(tch, broadcast_req, err_code); } diff --git a/storage/tianchi/srv_mq_msg.h b/storage/tianchi/srv_mq_msg.h index a405187..6a3c820 100644 --- a/storage/tianchi/srv_mq_msg.h +++ b/storage/tianchi/srv_mq_msg.h @@ -428,17 +428,6 @@ struct invalidate_mysql_dd_request { int result; }; -struct invalidate_all_dd_cache_request { - int result; -}; - -struct update_mysql_dd_cache_request { - char sql_str[MAX_DDL_SQL_LEN]; - uint32_t inst_id; - uint32_t thd_id; - int result; -}; - void* alloc_share_mem(void* shm_inst, uint32_t mem_size); void free_share_mem(void* shm_inst, void* shm_mem); diff --git a/storage/tianchi/tse_srv.h b/storage/tianchi/tse_srv.h index 4657030..271481f 100644 --- a/storage/tianchi/tse_srv.h +++ b/storage/tianchi/tse_srv.h @@ -612,9 +612,7 @@ int tse_check_db_table_exists(const char *db, const char *name, bool *is_exists) int tse_search_metadata_status(bool *cantian_metadata_switch, bool *cantian_cluster_ready); int tse_invalidate_mysql_dd_cache(tianchi_handler_t *tch, tse_invalidate_broadcast_request *broadcast_req, int *err_code); -int tse_invalidate_all_dd_cache(); int tse_broadcast_mysql_dd_invalidate(tianchi_handler_t *tch, tse_invalidate_broadcast_request *broadcast_req); -int tse_update_mysql_dd_cache(char *sql_str); /* Disaster Recovery Related Interface*/ int tse_set_cluster_role_by_cantian(bool is_slave); diff --git a/storage/tianchi/tse_srv_mq_module.cc b/storage/tianchi/tse_srv_mq_module.cc index c2c6bd2..f5eb8bc 100644 --- a/storage/tianchi/tse_srv_mq_module.cc +++ b/storage/tianchi/tse_srv_mq_module.cc @@ -104,26 +104,11 @@ static void* mq_msg_handler(void *arg) { CTC_IGNORE_ERROR_WHEN_MYSQL_SHUTDOWN(req, "tse_invalidate_mysql_dd_cache"); break; } - case TSE_FUNC_TYPE_INVALIDATE_ALL_OBJECTS: { - struct invalidate_all_dd_cache_request *req = (struct invalidate_all_dd_cache_request *)message_block->seg_buf[0]; - req->result = tse_invalidate_all_dd_cache(); - tse_log_note("[Disaster Recovery] invalidate all dd cache."); - CTC_IGNORE_ERROR_WHEN_MYSQL_SHUTDOWN(req, "tse_invalidate_all_mysql_dd_cache"); - break; - } - case TSE_FUNC_TYPE_UPDATE_DDCACHE: { - struct update_mysql_dd_cache_request *req = (struct update_mysql_dd_cache_request *)message_block->seg_buf[0]; - req->result = tse_update_mysql_dd_cache(req->sql_str); - tse_log_note("update dd cache: thd_id : %d, inst_id : %d, ret : %d.", req->thd_id, req->inst_id, - req->result); - CTC_IGNORE_ERROR_WHEN_MYSQL_SHUTDOWN(req, "tse_update_mysql_dd_cache"); - break; - } case TSE_FUNC_SET_CLUSTER_ROLE_BY_CANTIAN: { struct set_cluster_role_by_cantian_request *req = (struct set_cluster_role_by_cantian_request *)message_block->seg_buf[0]; req->result = tse_set_cluster_role_by_cantian(req->is_slave); tse_log_note("[Disaster Recovery] Set cluster role by cantian, is_slave:%d", req->is_slave); - CTC_IGNORE_ERROR_WHEN_MYSQL_SHUTDOWN(req, "tse_update_mysql_dd_cache"); + CTC_IGNORE_ERROR_WHEN_MYSQL_SHUTDOWN(req, "tse_set_cluster_role_by_cantian"); break; } default: { -- Gitee