From fca15fd184f62dea1f15fa6d5efe2027133d0133 Mon Sep 17 00:00:00 2001
From: qiuyang19960521 <qiuyang19@h-partners.com>
Date: Thu, 19 Dec 2024 13:14:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(compile):=20=E7=8B=AC=E7=AB=8B=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E7=AC=A6=E5=8F=B7=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 storage/ctc/CMakeLists.txt | 4 ++--
 storage/ctc/ctc_srv.h      | 8 --------
 storage/ctc/ha_ctc.cc      | 6 ------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/storage/ctc/CMakeLists.txt b/storage/ctc/CMakeLists.txt
index 90289c4..6703afc 100644
--- a/storage/ctc/CMakeLists.txt
+++ b/storage/ctc/CMakeLists.txt
@@ -68,14 +68,14 @@ IF (WITH_CANTIAN)
             ${CTC_SOURCES}
             STORAGE_ENGINE 
             MANDATORY
-            LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so libmessage_queue.so
+            LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so
         )
     ELSEIF (NOT WITHOUT_CTC_STORAGE_ENGINE)
         MYSQL_ADD_PLUGIN(ctc 
             ${CTC_SOURCES} 
             STORAGE_ENGINE 
             MODULE_ONLY
-            LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so libmessage_queue.so
+            LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so
         )
     ENDIF ()
 ELSE ()
diff --git a/storage/ctc/ctc_srv.h b/storage/ctc/ctc_srv.h
index 6cd3b2e..9918bd9 100644
--- a/storage/ctc/ctc_srv.h
+++ b/storage/ctc/ctc_srv.h
@@ -233,10 +233,6 @@ typedef struct {
     int err_code;
 } ctc_invalidate_broadcast_request;
 
-typedef struct {
-    int result;
-} mysql_init_lib_request;
-
 typedef struct {
     bool is_key_null;        // 该列数据是否为null
     uint8_t *left_key;       // 指向索引查询条件的左值
@@ -348,7 +344,6 @@ enum CTC_FUNC_TYPE {
     CTC_FUNC_TYPE_GET_MAX_SESSIONS,
     CTC_FUNC_LOCK_INSTANCE,
     CTC_FUNC_UNLOCK_INSTANCE,
-    CTC_FUNC_INIT_MYSQL_LIB,
     CTC_FUNC_CHECK_TABLE_EXIST,
     CTC_FUNC_SEARCH_METADATA_SWITCH,
     CTC_FUNC_QUERY_SHM_USAGE,
@@ -615,9 +610,6 @@ typedef struct en_ctcpart_scan_range {
 int srv_wait_instance_startuped(void);
 int ctc_alloc_inst_id(uint32_t *inst_id);
 int ctc_release_inst_id(uint32_t inst_id);
-#ifdef WITH_CANTIAN
-int init_mysql_lib(void);
-#endif
 
 int ctc_open_table(ctc_handler_t *tch, const char *table_name, const char *user_name);
 int ctc_close_table(ctc_handler_t *tch);
diff --git a/storage/ctc/ha_ctc.cc b/storage/ctc/ha_ctc.cc
index e0844d8..722771d 100644
--- a/storage/ctc/ha_ctc.cc
+++ b/storage/ctc/ha_ctc.cc
@@ -542,12 +542,6 @@ static int ctc_reg_instance() {
                    CTC_START_TIMEOUT);
     sleep(1);
   }
-#ifdef WITH_CANTIAN
-  ret = (ct_errno_t)init_mysql_lib();
-  if (ret == CT_SUCCESS) {
-    ctc_log_system("[CTC_INIT]:ctc reg mysql proxy lib in cantian success");
-  }
-#endif
   return convert_ctc_error_code_to_mysql(ret);
 }
 
-- 
Gitee