Skip to content

Commit c6cd78e

Browse files
committed
modify:match xengine v7.24
1 parent a35c1a5 commit c6cd78e

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

XEngine_Release/XEngine_Cert/.gitignore

Whitespace-only changes.

XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_MySql/XStorage_MySql.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQuery(XSTORAGECORE_DBFILE*** pppSt_List
264264
}
265265
//查询
266266
XHDATA xhTable = 0;
267-
DWORD64 nllLine = 0;
268-
DWORD64 nllRow = 0;
267+
__int64u nllLine = 0;
268+
__int64u nllRow = 0;
269269
TCHAR tszSQLStatement[1024];
270270
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
271271
//检查是否时间范围检索
@@ -292,15 +292,15 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQuery(XSTORAGECORE_DBFILE*** pppSt_List
292292
}
293293
list<XSTORAGECORE_DBFILE> stl_ListFile;
294294
//轮训
295-
for (DWORD64 i = 0; i < nllLine; i++)
295+
for (__int64u i = 0; i < nllLine; i++)
296296
{
297297
TCHAR **pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
298298
if (NULL == pptszResult[0])
299299
{
300300
continue;
301301
}
302-
DWORD64 dwLineResult = 0;
303-
DWORD64 dwFieldResult = 0;
302+
__int64u dwLineResult = 0;
303+
__int64u dwFieldResult = 0;
304304
XNETHANDLE xhResult;
305305

306306
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
@@ -338,7 +338,7 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQuery(XSTORAGECORE_DBFILE*** pppSt_List
338338
if (DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhResult, tszSQLStatement, &dwLineResult, &dwFieldResult))
339339
{
340340
//循环获取所有查找到的文件
341-
for (DWORD64 j = 0; j < dwLineResult; j++)
341+
for (__int64u j = 0; j < dwLineResult; j++)
342342
{
343343
TCHAR **pptszFileResult = DataBase_MySQL_GetResult(xhDBSQL, xhResult);
344344

@@ -430,8 +430,8 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQueryForTable(XSTORAGECORE_DBFILE*** pp
430430
}
431431
//查询
432432
XHDATA xhTable = 0;
433-
DWORD64 nllLine = 0;
434-
DWORD64 nllRow = 0;
433+
__int64u nllLine = 0;
434+
__int64u nllRow = 0;
435435

436436
TCHAR tszSQLStatement[1024];
437437
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
@@ -446,7 +446,7 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQueryForTable(XSTORAGECORE_DBFILE*** pp
446446
}
447447
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_ListFile, (int)nllLine, sizeof(XSTORAGECORE_DBFILE));
448448
//循环获取所有查找到的文件
449-
for (DWORD64 i = 0; i < nllLine; i++)
449+
for (__int64u i = 0; i < nllLine; i++)
450450
{
451451
TCHAR** pptszFileResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
452452

@@ -525,8 +525,8 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQueryForHash(XSTORAGECORE_DBFILE* pSt_F
525525
}
526526
//查询
527527
XHDATA xhTable = 0;
528-
DWORD64 nllLine = 0;
529-
DWORD64 nllRow = 0;
528+
__int64u nllLine = 0;
529+
__int64u nllRow = 0;
530530
BOOL bFound = FALSE;
531531
TCHAR tszSQLStatement[1024];
532532
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
@@ -546,15 +546,15 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQueryForHash(XSTORAGECORE_DBFILE* pSt_F
546546
return FALSE;
547547
}
548548
//轮训
549-
for (DWORD64 i = 0; i < nllLine; i++)
549+
for (__int64u i = 0; i < nllLine; i++)
550550
{
551551
TCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
552552
if (NULL == pptszResult[0])
553553
{
554554
continue;
555555
}
556-
DWORD64 dwLineResult = 0;
557-
DWORD64 dwFieldResult = 0;
556+
__int64u dwLineResult = 0;
557+
__int64u dwFieldResult = 0;
558558
XNETHANDLE xhResult;
559559

560560
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
@@ -571,7 +571,7 @@ BOOL CXStorage_MySql::XStorage_MySql_FileQueryForHash(XSTORAGECORE_DBFILE* pSt_F
571571
if (DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhResult, tszSQLStatement, &dwLineResult, &dwFieldResult))
572572
{
573573
//循环获取所有查找到的文件
574-
for (DWORD64 j = 0; j < dwLineResult; j++)
574+
for (__int64u j = 0; j < dwLineResult; j++)
575575
{
576576
TCHAR** pptszFileResult = DataBase_MySQL_GetResult(xhDBSQL, xhResult);
577577

@@ -644,8 +644,8 @@ BOOL CXStorage_MySql::XStorage_MySql_FileGetCount(__int64x *pInt_Count, __int64x
644644
XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_CORE_DB_GETCOUNT_PARAMENT;
645645
return FALSE;
646646
}
647-
DWORD64 nllRow = 0;
648-
DWORD64 nllColumn = 0;
647+
__int64u nllRow = 0;
648+
__int64u nllColumn = 0;
649649
TCHAR tszSQLStatement[1024]; //SQL语句
650650
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
651651

@@ -792,16 +792,16 @@ BOOL CXStorage_MySql::XStorage_MySql_TimeDel()
792792
{
793793
XStorage_IsErrorOccur = FALSE;
794794

795-
DWORD64 dwLine = 0;
796-
DWORD64 dwField = 0;
795+
__int64u dwLine = 0;
796+
__int64u dwField = 0;
797797
XNETHANDLE xhTableResult;
798798
TCHAR tszSQLQuery[2048];
799799

800800
memset(tszSQLQuery, '\0', sizeof(tszSQLQuery));
801801
_stprintf_s(tszSQLQuery, _T("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='XEngine_Storage' AND TABLE_TYPE='BASE TABLE'"));
802802
if (DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTableResult, tszSQLQuery, &dwLine, &dwField))
803803
{
804-
for (DWORD64 i = 0; i < dwLine; i++)
804+
for (__int64u i = 0; i < dwLine; i++)
805805
{
806806
TCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTableResult);
807807
if (NULL == pptszResult[0])

0 commit comments

Comments
 (0)