Delete useless MYSQL code

improved:sql packet module

Author: xengine-qyt

XEngine_Source/VSCopy.bat

@@ -21,6 +21,7 @@ copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\libmariadb.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\libpq.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\sqlite3.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\zlib1.dll" "./"
+copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\plugin\caching_sha2_password.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_LibEx\libcrypto-1_1.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_LibEx\libssl-1_1.dll" "./"
 copy /y "%XEngine_Library%\x86\XEngine_LibEx\libcurl.dll" "./"

XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_MySql/XStorage_MySql.cpp

@@ -67,6 +67,7 @@ BOOL CXStorage_MySql::XStorage_MySql_Init(DATABASE_MYSQL_CONNECTINFO *pSt_DBConn
         return FALSE;
     }
     bIsRun = TRUE;
+   
     pSTDThread = make_shared<std::thread>(XStorage_MySql_Thread, this);
     if (!pSTDThread->joinable())
     {
@@ -93,10 +94,15 @@ BOOL CXStorage_MySql::XStorage_MySql_Destory()
         return TRUE;
     }
     bIsRun = FALSE;
-    pSTDThread->join();
 
+    if (NULL != pSTDThread)
+    {
+        if (pSTDThread->joinable())
+        {
+            pSTDThread->join();
+        }
+    }
     DataBase_MySQL_Close(xhDBSQL);
-
     return TRUE;
 }
 /********************************************************************
@@ -821,15 +827,6 @@ BOOL CXStorage_MySql::XStorage_MySql_TimeDel()
 
                     for (int i = 0; i < nListCount; i++)
                     {
-                        //更新文件个数和大小
-                        memset(tszSQLQuery, '\0', sizeof(tszSQLQuery));
-                        _stprintf_s(tszSQLQuery, _T("UPDATE `XStorage_Count` SET FileCount = FileCount - 1,FileSize = FileSize - %lld"), ppSt_ListFile[i]->st_ProtocolFile.nFileSize);
-                        if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLQuery))
-                        {
-                            XStorage_IsErrorOccur = TRUE;
-                            XStorage_dwErrorCode = DataBase_GetLastError();
-                            return FALSE;
-                        }
                         //删除文件
                         TCHAR tszFilePath[2048];
                         memset(tszFilePath, '\0', sizeof(tszFilePath));
@@ -857,20 +854,17 @@ XHTHREAD CXStorage_MySql::XStorage_MySql_Thread(LPVOID lParam)
     CXStorage_MySql *pClass_This = (CXStorage_MySql *)lParam;
     time_t nTimeStart = time(NULL);
     time_t nTimeEnd = 0;
-    BOOL bFirst = TRUE;
     int nTime = 60 * 60 * 12;
 
-    while (pClass_This->bIsRun)
-    {
-		if (((nTimeEnd - nTimeStart) > nTime) || bFirst)
+	while (pClass_This->bIsRun)
+	{
+		if ((nTimeEnd - nTimeStart) > nTime)
 		{
 			pClass_This->XStorage_MySql_TimeDel();
 			pClass_This->XStorage_MySql_CreateTable();
-            bFirst = FALSE;
 		}
-        nTimeEnd = time(NULL);
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-    }
+		nTimeEnd = time(NULL);
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+	}
     return 0;
-}
-
+}

XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLite/XStorage_SQLite.cpp

@@ -92,8 +92,16 @@ BOOL CXStorage_SQLite::XStorage_SQLite_Destory()
         return TRUE;
     }
     bIsRun = FALSE;
-    pSTDThread->join();
-    delete pSTDThread;
+
+    if (NULL != pSTDThread)
+    {
+        if (pSTDThread->joinable())
+        {
+            pSTDThread->join();
+            delete pSTDThread;
+            pSTDThread = NULL;
+        }
+    }
 	DataBase_SQLite_Close(xhSQL);
 	return TRUE;
 }
@@ -639,20 +647,17 @@ XHTHREAD CXStorage_SQLite::XStorage_SQLite_Thread(LPVOID lParam)
     CXStorage_SQLite* pClass_This = (CXStorage_SQLite*)lParam;
     time_t nTimeStart = time(NULL);
     time_t nTimeEnd = 0;
-    BOOL bFirst = TRUE;
     int nTime = 60 * 60 * 12;
 
     while (pClass_This->bIsRun)
     {
-        if (((nTimeEnd - nTimeStart) > nTime) || bFirst)
+        if ((nTimeEnd - nTimeStart) > nTime)
         {
             pClass_This->XStorage_SQLite_TimeDel();
             pClass_This->XStorage_SQLite_CreateTable();
-            bFirst = FALSE;
         }
         nTimeEnd = time(NULL);
-        std::this_thread::sleep_for(std::chrono::seconds(1));
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
     return 0;
-}
-
+}