1

cpp/dbpool.cc

@@ -141,7 +141,6 @@ namespace f8
             }
             last_checkdb_tick_ = a8::XGetTickCount();
             if (last_conn_ && last_query_) {
-                #if 0
                 if (last_query_->ExecQuery("SELECT 1;", {}) <= 0) {
 #if 0
                     a8::UdpLog::Instance()->Warning("mysql disconnect", {});
@@ -153,7 +152,6 @@ namespace f8
                     }
 #endif
                 }
-                                    #endif
             }
         }
 
@@ -203,9 +201,7 @@ namespace f8
             }
             printf("CreateConn\n");
             last_conn_ = new a8::mysql::Connection();
-            #if 0
             last_query_ = last_conn_->CreateQuery();
-            #endif
             if (last_conn_->Connect(
                                     conn_info.Get("host"),
                                     conn_info.Get("port"),
@@ -213,9 +209,7 @@ namespace f8
                                     conn_info.Get("passwd"),
                                     conn_info.Get("database")
                                     )) {
-                #if 0
                 f8::InitMysqlConnection(last_query_);
-                #endif
             }
             return true;
         }
@@ -241,7 +235,6 @@ namespace f8
             if (NeedReCreateConn(node->conn_info)) {
                 ReCreateConn(node->conn_info);
             }
-#if 0
             switch (node->query_type) {
             case 0:
                 {
@@ -301,7 +294,6 @@ namespace f8
                 }
                 break;
             }
-            #endif
         }
 
     public:
@@ -329,12 +321,6 @@ namespace f8
 
         void Init()
         {
-#if 0
-            /*mysql_init()不是完全线程安全的，但是只要成功调用一次就后就线程安全了，
-              如果有多线程并发使用mysql_init()，建议在程序初始化时空调一次mysql_init()，他的这点特性很像qsort()
-            */
-            a8::mysql::Connection conn;
-#endif
             curr_seqid = 1000001;
             exec_async_query_msgid = MsgQueue::Instance()->AllocIMMsgId();
         }

test/app.cc

@@ -88,14 +88,6 @@ void App::Init(int argc, char* argv[])
     InitLog();
     a8::Timer::Instance()->Init();
     f8::MsgQueue::Instance()->Init();
-    #if 0
-    #if 1
-    auto ret = mysql_library_init(0, nullptr, nullptr);
-    assert(ret == 0);
-    #endif
-    mysql_thread_init();
-    mysql_init_conn = mysql_init(nullptr);
-    #endif
     f8::DBPool::Instance()->Init();
     f8::DBPool::Instance()->SetThreadNum(10);
 
@@ -132,15 +124,6 @@ void App::UnInit()
     f8::MsgQueue::Instance()->UnInit();
     a8::Timer::Instance()->UnInit();
     UnInitLog();
-
-    #if 0
-    mysql_close(mysql_init_conn);
-    mysql_thread_end();
-    #if 0
-    mysql_library_end();
-    #endif
-    #endif
-
     delete im_msg_mutex_;
     im_msg_mutex_ = nullptr;
     delete loop_cond_;