From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 03 四月 2019 09:54:33 +0800 Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3 --- QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h index 7940970..0667bbf 100644 --- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h +++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h @@ -44,6 +44,7 @@ RWLock m_rwLock; std::mutex topResultMtx; std::map<std::thread::id, FaceResults> topResult; + RWLock m_dbRWLocks_Lock; std::map<std::thread::id, RWLock> m_dbRWLocks; ErlangTool::ErlangDbTool *m_erlangDbTool; @@ -54,11 +55,10 @@ static bool getRet(std::string startTime, std::string endTime) { auto crrentTime = AppUtil::getTimeSecString(); - if (crrentTime.compare(startTime) > 0 && crrentTime.compare(endTime) < 0) { + if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0 || endTime == "0000-00-00 00:00:00")) { return true; } return false; - } #endif //COMPARETEST_FACEDBCOMPARESERVER_H -- Gitblit v1.8.0