From d5ae54ceb9770963fbe88aa0170c08d0ae648b05 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 16:21:56 +0800
Subject: [PATCH] 删除一些不必要的代码，添加一些注释
---
QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.h | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.h b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.h
index 7a1c16b..8a70b5c 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.h
@@ -24,6 +24,8 @@
//};
static bool t_live_ret = true;
+
+//鍏ㄥ眬鐨勪俊鍙烽噺锛屽鏋滄暟鎹埛鏂板欢杩熻繃楂樺彲浠ユ敼涓轰娇鐢╪sq娑堟伅闃熷垪銆�
static pthread_cond_t func_cond(PTHREAD_COND_INITIALIZER);
static pthread_mutex_t func_cond_mutex(PTHREAD_MUTEX_INITIALIZER);
@@ -39,44 +41,71 @@
virtual ~FaceFeatureSearchServerI();
public:
+ /**
+ * @deprecated
+ * @return
+ */
virtual ::FaceSearch::FaceResults faceSearchMax(const ::FaceSearch::Data &, const ::std::string &,
const ::Ice::Current & = ::Ice::emptyCurrent);
+ /***
+ * 瀵规瘮鑾峰彇绗琻澶х殑浜哄憳
+ * @return
+ */
virtual ::FaceSearch::FaceResults
faceSearchTopN(const ::FaceSearch::Data &, const ::std::string &, ::Ice::Int, ::Ice::Float,
const ::Ice::Current & = ::Ice::emptyCurrent);
private:
+ /**
+ * @deprecated
+ * @param nodeName
+ * @param cookie
+ * @return
+ */
bool initErlang(std::string nodeName, std::string cookie);
- //#todo delete cache
//#todo loadData
+ /**
+ * 鍔犺浇浜鸿劯灞炴��
+ * @param faceFea
+ * @return
+ */
static bool loadFeatureData(FaceFeatureSearchServerI *faceFea);
+ /**
+ * 鏁版嵁鏇存柊绾跨▼锛屾湁淇″彿瑙﹀彂鎵嶄細鏇存柊
+ * @param faceFea
+ */
static void dataUpdate(FaceFeatureSearchServerI *faceFea);
+ /***
+ * 绛夊緟搴曞簱琛ㄥ姞杞芥垚鍔�
+ * @param faceFea
+ * @param loop
+ */
static void waitTables(FaceFeatureSearchServerI *faceFea, int loop = -1);
-
-// void erlangCallBackFunc(std::string);
private:
long m_inTime;
+ // 鐗瑰緛瀵规瘮绫�
std::map<std::string, FaceDBCompareServer *> m_faceFCMAP;
+ // 搴曞簱绫诲瀷锛岀敓鏁堟椂闂寸瓑
std::map<std::string, TableInfo> m_tableType;
+ // 瀵� m_faceFCMAP 鍔犺鍐欓攣
+ // 褰撳姣旀椂锛屾暟鎹埛鏂颁細绛夊緟
RWLock m_rwLock;
+
ErlangTool::ErlangDbTool m_erlangDbTool;
+
SqliteFaceEncap m_sqliteFaceEncap;
+
std::mutex m_mutex;
bool m_retUpdatePthread;
Base64 base64;
-// Ice::ObjectPrx base_FaceMemoryData;
-// IceRpcClient<::FaceSearch::FaceMemoryDataPrx> m_faceMemoryClient;
-// ::FaceSearch::FaceMemoryDataPrx serverFaceMemoryData;
-
-// func_cond_mutex(PTHREAD_MUTEX_INITIALIZER), func_cond(PTHREAD_COND_INITIALIZER)
EsDBTool pManagerEsDB;//(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
};
--
Gitblit v1.8.0