Skip to content

Commit 72950e4

Browse files
xengine-qytxengine-qyt
committed
fixed:The total available time of memory cache data is not handled correctly
1 parent 8660615 commit 72950e4

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"bDataInsertEnable":true,
4040
"bUserQueryEnable":true,
4141
"nTimeLast":3600,
42-
"nTimeStart":0
42+
"nTimeCount":0
4343
},
4444
"XReport":{
4545
"bEnable":true,

‎XEngine_Source/MQCore_ConfigModule/Config_Define.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ typedef struct
6161
bool bDataInsertEnable;
6262
bool bUserQueryEnable;
6363
int nTimeLast;
64-
int nTimeStart;
64+
int nTimeCount;
6565
}st_XMemory;
6666
struct
6767
{

‎XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
134134
pSt_ServerConfig->st_XMemory.bDataInsertEnable = st_JsonXMemory["bDataInsertEnable"].asBool();
135135
pSt_ServerConfig->st_XMemory.bUserQueryEnable = st_JsonXMemory["bUserQueryEnable"].asBool();
136136
pSt_ServerConfig->st_XMemory.nTimeLast = st_JsonXMemory["nTimeLast"].asInt();
137-
pSt_ServerConfig->st_XMemory.nTimeStart = st_JsonXMemory["nTimeStart"].asInt();
137+
pSt_ServerConfig->st_XMemory.nTimeCount = st_JsonXMemory["nTimeCount"].asInt();
138138

139139
if (st_JsonRoot["XReport"].empty() || (3 != st_JsonRoot["XReport"].size()))
140140
{

‎XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ CMemoryCache_DBData::~CMemoryCache_DBData()
2929
类型：整数型
3030
可空：N
3131
意思：允许的最后更新时间存在秒数
32-
参数.二：nTimeStart
32+
参数.二：nTimeCount
3333
In/Out：In
3434
类型：整数型
3535
可空：N
36-
意思：允许的最大保留时间
36+
意思：允许的最大保留时间.将不关心是否使用,0不启用
3737
返回值
3838
类型：逻辑型
3939
意思：是否成功
4040
备注：
4141
*********************************************************************/
42-
bool CMemoryCache_DBData::MemoryCache_DBData_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam /* = NULL */)
42+
bool CMemoryCache_DBData::MemoryCache_DBData_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam /* = NULL */)
4343
{
4444
MemoryCache_IsErrorOccur = false;
4545

4646
bIsRun = true;
4747

4848
m_nTimeLast = nTimeLast;
49-
m_nTimeStart = nTimeStart;
49+
m_nTimeCount = nTimeCount;
5050
m_lParam = lParam;
5151
lpCall_MemoryCache = fpCall_MemoryCache;
5252

@@ -201,7 +201,7 @@ bool CMemoryCache_DBData::MemoryCache_DBData_DataQuery(XENGINE_DBMESSAGEQUEUE* p
201201
In/Out：In
202202
类型：数据结构指针
203203
可空：N
204-
意思：输入要操作的信息
204+
意思：输入要操作的信息`
205205
返回值
206206
类型：逻辑型
207207
意思：是否成功
@@ -301,7 +301,7 @@ XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)
301301
{
302302
stl_ListDelete.push_back(stl_MapIterator->second.st_DBMessageInfo);
303303
}
304-
else if (pClass_This->m_nTimeStart > 0 && (nTimeEnd - pClass_This->m_nTimeStart))
304+
else if (pClass_This->m_nTimeCount > 0 && ((nTimeEnd - stl_MapIterator->second.nTimeLast) > pClass_This->m_nTimeCount))
305305
{
306306
stl_ListDelete.push_back(stl_MapIterator->second.st_DBMessageInfo);
307307
}

‎XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CMemoryCache_DBData
4242
CMemoryCache_DBData();
4343
~CMemoryCache_DBData();
4444
public:
45-
bool MemoryCache_DBData_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
45+
bool MemoryCache_DBData_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
4646
bool MemoryCache_DBData_SetHandle(XNETHANDLE xhDBSQL);
4747
bool MemoryCache_DBData_Destory();
4848
public:
@@ -57,7 +57,7 @@ class CMemoryCache_DBData
5757
private:
5858
bool bIsRun = false;
5959
int m_nTimeLast = 0;
60-
int m_nTimeStart = 0;
60+
int m_nTimeCount = 0;
6161
XNETHANDLE m_xhDBSQL = 0;
6262

6363
XPVOID m_lParam;

‎XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ CMemoryCache_DBUser::~CMemoryCache_DBUser()
2929
类型：整数型
3030
可空：N
3131
意思：允许的最后更新时间存在秒数
32-
参数.二：nTimeStart
32+
参数.二：nTimeCount
3333
In/Out：In
3434
类型：整数型
3535
可空：N
36-
意思：允许的最大保留时间
36+
意思：允许的最大保留时间.将不关心是否使用,0不启用
3737
返回值
3838
类型：逻辑型
3939
意思：是否成功
4040
备注：
4141
*********************************************************************/
42-
bool CMemoryCache_DBUser::MemoryCache_DBUser_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam /* = NULL */)
42+
bool CMemoryCache_DBUser::MemoryCache_DBUser_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam /* = NULL */)
4343
{
4444
MemoryCache_IsErrorOccur = false;
4545

4646
bIsRun = true;
4747

4848
m_nTimeLast = nTimeLast;
49-
m_nTimeStart = nTimeStart;
49+
m_nTimeCount = nTimeCount;
5050
m_lParam = lParam;
5151
lpCall_MemoryCache = fpCall_MemoryCache;
5252

@@ -229,7 +229,7 @@ XHTHREAD CALLBACK CMemoryCache_DBUser::DBModule_MQUser_TimeThread(XPVOID lParam)
229229
{
230230
stl_ListDelete.push_back(stl_MapIterator->second.st_DBUserInfo);
231231
}
232-
else if (pClass_This->m_nTimeStart > 0 && (nTimeEnd - pClass_This->m_nTimeStart))
232+
else if (pClass_This->m_nTimeCount > 0 && ((nTimeEnd - stl_MapIterator->second.nTimeLast) > pClass_This->m_nTimeCount))
233233
{
234234
stl_ListDelete.push_back(stl_MapIterator->second.st_DBUserInfo);
235235
}

‎XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CMemoryCache_DBUser
2323
CMemoryCache_DBUser();
2424
~CMemoryCache_DBUser();
2525
public:
26-
bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
26+
bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
2727
bool MemoryCache_DBUser_SetHandle(XNETHANDLE xhDBSQL);
2828
bool MemoryCache_DBUser_Destory();
2929
public:
@@ -35,7 +35,7 @@ class CMemoryCache_DBUser
3535
private:
3636
bool bIsRun = false;
3737
int m_nTimeLast = 0;
38-
int m_nTimeStart = 0;
38+
int m_nTimeCount = 0;
3939
XNETHANDLE m_xhDBSQL = 0;
4040

4141
XPVOID m_lParam;

‎XEngine_Source/MQCore_MemoryCache/MemoryCache_Define.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ extern "C" XLONG MemoryCache_GetLastError(int *pInt_SysError = NULL);
3535
类型：整数型
3636
可空：N
3737
意思：允许的最后更新时间存在秒数
38-
参数.二：nTimeStart
38+
参数.二：nTimeCount
3939
In/Out：In
4040
类型：整数型
4141
可空：N
42-
意思：允许的最大保留时间
42+
意思：允许的最大保留时间.将不关心是否使用,0不启用
4343
返回值
4444
类型：逻辑型
4545
意思：是否成功
4646
备注：
4747
*********************************************************************/
48-
extern "C" bool MemoryCache_DBData_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
48+
extern "C" bool MemoryCache_DBData_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
4949
/********************************************************************
5050
函数名称：MemoryCache_DBData_SetHandle
5151
函数功能：设置句柄
@@ -141,17 +141,17 @@ extern "C" bool MemoryCache_DBData_QueueInsert(LPCXSTR lpszSQLStr, XENGINE_DBMES
141141
类型：整数型
142142
可空：N
143143
意思：允许的最后更新时间存在秒数
144-
参数.二：nTimeStart
144+
参数.二：nTimeCount
145145
In/Out：In
146146
类型：整数型
147147
可空：N
148-
意思：允许的最大保留时间
148+
意思：允许的最大保留时间.将不关心是否使用,0不启用
149149
返回值
150150
类型：逻辑型
151151
意思：是否成功
152152
备注：
153153
*********************************************************************/
154-
extern "C" bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
154+
extern "C" bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam = NULL);
155155
/********************************************************************
156156
函数名称：MemoryCache_DBUser_SetHandle
157157
函数功能：设置句柄

‎XEngine_Source/MQCore_MemoryCache/pch.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ extern "C" XLONG MemoryCache_GetLastError(int* pInt_SysError)
3131
/*************************************************************************
3232
高速缓存导出函数
3333
**************************************************************************/
34-
extern "C" bool MemoryCache_DBData_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam)
34+
extern "C" bool MemoryCache_DBData_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam)
3535
{
36-
return m_MemoryDBData.MemoryCache_DBData_Init(nTimeLast, nTimeStart, fpCall_MemoryCache, lParam);
36+
return m_MemoryDBData.MemoryCache_DBData_Init(nTimeLast, nTimeCount, fpCall_MemoryCache, lParam);
3737
}
3838
extern "C" bool MemoryCache_DBData_SetHandle(XNETHANDLE xhDBSQL)
3939
{
@@ -62,9 +62,9 @@ extern "C" bool MemoryCache_DBData_QueueInsert(LPCXSTR lpszSQLStr, XENGINE_DBMES
6262
/*************************************************************************
6363
用户信息高速缓存导出函数
6464
**************************************************************************/
65-
extern "C" bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeStart, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam)
65+
extern "C" bool MemoryCache_DBUser_Init(int nTimeLast, int nTimeCount, CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE fpCall_MemoryCache, XPVOID lParam)
6666
{
67-
return m_MemoryDBUser.MemoryCache_DBUser_Init(nTimeLast, nTimeStart, fpCall_MemoryCache, lParam);
67+
return m_MemoryDBUser.MemoryCache_DBUser_Init(nTimeLast, nTimeCount, fpCall_MemoryCache, lParam);
6868
}
6969
extern "C" bool MemoryCache_DBUser_SetHandle(XNETHANDLE xhDBSQL)
7070
{

‎XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,29 +176,29 @@ int main(int argc, char** argv)
176176

177177
if (st_ServiceCfg.st_XMemory.bDataQueryEnable || st_ServiceCfg.st_XMemory.bDataInsertEnable)
178178
{
179-
if (!MemoryCache_DBData_Init(st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart, MessageQueue_CBTask_MemoryCache))
179+
if (!MemoryCache_DBData_Init(st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount, MessageQueue_CBTask_MemoryCache))
180180
{
181181
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中，初始化消息内容高速缓存服务失败，错误：%lX"), MemoryCache_GetLastError());
182182
goto NETSERVICEEXIT;
183183
}
184-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，初始化消息内容高速缓存服务成功,更新最大时间:%d,存储最大时间:%d"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart);
184+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，初始化消息内容高速缓存服务成功,更新最大时间:%d,存储最大时间:%d"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount);
185185
}
186186
else
187187
{
188-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，检测到没有启用消息内容高速缓存服务"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart);
188+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，检测到没有启用消息内容高速缓存服务"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount);
189189
}
190190
if (st_ServiceCfg.st_XMemory.bUserQueryEnable)
191191
{
192-
if (!MemoryCache_DBUser_Init(st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart, MessageQueue_CBTask_MemoryCache))
192+
if (!MemoryCache_DBUser_Init(st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount, MessageQueue_CBTask_MemoryCache))
193193
{
194194
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中，初始化用户信息高速缓存服务失败，错误：%lX"), MemoryCache_GetLastError());
195195
goto NETSERVICEEXIT;
196196
}
197-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，初始化用户信息高速缓存服务成功,更新最大时间:%d,存储最大时间:%d"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart);
197+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，初始化用户信息高速缓存服务成功,更新最大时间:%d,存储最大时间:%d"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount);
198198
}
199199
else
200200
{
201-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，检测到没有启用用户信息高速缓存服务"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeStart);
201+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，检测到没有启用用户信息高速缓存服务"), st_ServiceCfg.st_XMemory.nTimeLast, st_ServiceCfg.st_XMemory.nTimeCount);
202202
}
203203

204204
if (!bIsTest)

0 commit comments

Comments
 (0)