modify variable name

Change-Id: Ic8bf6e4ebe23d23a5dfc670be2fe07a6f2352554

demo-serving/CMakeLists.txt

@@ -32,7 +32,7 @@ if(WITH_GPU)
 endif()
 target_link_libraries(serving opencv_imgcodecs
         ${opencv_depend_libs} -Wl,--whole-archive fluid_cpu_engine
-        -Wl,--no-whole-archive pdserving paddle_fluid ${paddle_depend_libs} rocksdb_impl rocksdb
+        -Wl,--no-whole-archive pdserving paddle_fluid ${paddle_depend_libs} kvdb rocksdb
         ${MKLML_LIB} ${MKLML_IOMP_LIB} -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -lbz2)
 
 install(TARGETS serving

kvdb/CMakeLists.txt

@@ -8,8 +8,8 @@ set(SRC_LIST ${CMAKE_CURRENT_LIST_DIR}/src/test_rocksdb.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/paddle_rocksdb.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/gtest_kvdb.cpp)
        
-add_library(rocksdb_impl ${SRC_LIST})
-install(TARGETS rocksdb_impl ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib/)
+add_library(kvdb ${SRC_LIST})
+install(TARGETS kvdb ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib/)
 
 add_executable(kvdb_test ${SRC_LIST})
 add_dependencies(kvdb_test rocksdb)

kvdb/include/kvdb/kvdb_impl.h

@@ -45,7 +45,7 @@ public:
     virtual std::string GetMD5() = 0;
     virtual bool CheckDiff() = 0;
     virtual std::chrono::system_clock::time_point GetTimeStamp() = 0;
-    virtual void Read(std::vector<std::string>&) = 0;
+    virtual void Read(AbstractParamDict*) = 0;
     virtual ~AbstractDictReader() = 0;
 protected:
     std::string filename_;

kvdb/include/kvdb/mock_kvdb_impl.h → kvdb/include/kvdb/rocksdb_impl.h

@@ -30,18 +30,18 @@ public:
     static int db_count;
 };
 
-class MockDictReader : public AbstractDictReader{
+class RocksDBDictReader : public AbstractDictReader{
 public:
     std::string GetFileName();
     void SetFileName(std::string);
     std::string GetMD5();
     bool CheckDiff();
     std::chrono::system_clock::time_point GetTimeStamp();
-    void Read(std::vector<std::string>&);
-    ~MockDictReader();
+    void Read(AbstractParamDict*);
+    ~RocksDBDictReader();
 };
 
-class MockParamDict : public AbstractParamDict{
+class RocksDBParamDict : public AbstractParamDict{
 public:
     std::vector<AbsDictReaderPtr> GetDictReaderLst();
     void SetDictReaderLst(std::vector<AbsDictReaderPtr>);
@@ -59,7 +59,7 @@ public:
     void SetKVDB(std::pair<AbsKVDBPtr, AbsKVDBPtr>);
     void CreateKVDB();
 
-    ~MockParamDict();
+    ~RocksDBParamDict();
 };
 
 

kvdb/src/gtest_db_func.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 #include "kvdb/kvdb_impl.h"
 #include "kvdb/paddle_rocksdb.h"
 #include <gtest/gtest.h>

kvdb/src/gtest_db_thread.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 #include "kvdb/kvdb_impl.h"
 #include "kvdb/paddle_rocksdb.h"
 #include <gtest/gtest.h>

kvdb/src/gtest_kvdb.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 #include "kvdb/kvdb_impl.h"
 #include "kvdb/paddle_rocksdb.h"
 #include <gtest/gtest.h>
@@ -28,8 +28,8 @@ protected:
     
     static void SetUpTestCase() {
         kvdb = std::make_shared<RocksKVDB>();
-        dict_reader = std::make_shared<MockDictReader>();
-        param_dict = std::make_shared<MockParamDict>();
+        dict_reader = std::make_shared<RocksDBDictReader>();
+        param_dict = std::make_shared<RocksDBParamDict>();
     }
     
     static AbsKVDBPtr kvdb;
@@ -81,7 +81,7 @@ TEST_F(KVDBTest, AbstractDictReader_Unit_Test) {
     ASSERT_NE(timestamp_2, timestamp_3);   
 }
 #include <cmath>
-TEST_F(KVDBTest, MockParamDict_Unit_Test) {
+TEST_F(KVDBTest, RocksDBParamDict_Unit_Test) {
     std::string test_in_filename = "abs_dict_reader_test_in.txt";
     param_dict->SetDictReaderLst({dict_reader});
     param_dict->CreateKVDB();

kvdb/src/mock_param_dict_impl.cpp

@@ -12,22 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 #include <thread>
 #include <iterator>
 #include <fstream>
 #include <sstream>
-std::string MockDictReader::GetFileName() {
+std::string RocksDBDictReader::GetFileName() {
     return this->filename_;
 }
 
-void MockDictReader::SetFileName(std::string filename) {
+void RocksDBDictReader::SetFileName(std::string filename) {
     this->filename_ = filename;
     this->last_md5_val_ = this->GetMD5();
     this->time_stamp_ = std::chrono::system_clock::now();
 }
 
-std::string MockDictReader::GetMD5() {
+std::string RocksDBDictReader::GetMD5() {
    auto getCmdOut = [] (std::string cmd) {
         std::string data;
         FILE *stream = nullptr;
@@ -50,40 +50,40 @@ std::string MockDictReader::GetMD5() {
     return md5val;
 }
 
-bool MockDictReader::CheckDiff() {
+bool RocksDBDictReader::CheckDiff() {
     return this->GetMD5() == this->last_md5_val_;
 }
 
-std::chrono::system_clock::time_point MockDictReader::GetTimeStamp() {
-//TODO: Implement Get Time Stamp of dict file
+std::chrono::system_clock::time_point RocksDBDictReader::GetTimeStamp() {
     return this->time_stamp_;  
 }
 
-void MockDictReader::Read(std::vector<std::string>& res) {
+void RocksDBDictReader::Read(AbstractParamDict* param_dict) {
     std::string line;
     std::ifstream infile(this->filename_);
     if (infile.is_open()) {
         while (getline(infile, line)) {
-            res.push_back(line);
+            //TODO: Write String Parse Here
+            // param_dict->InsertSparseValue();
         }
     }
     infile.close();
 }
 
-MockDictReader::~MockDictReader() {
+RocksDBDictReader::~RocksDBDictReader() {
 //TODO: I imageine nothing to do here
 }
 
 
-std::vector<AbsDictReaderPtr> MockParamDict::GetDictReaderLst() {
+std::vector<AbsDictReaderPtr> RocksDBParamDict::GetDictReaderLst() {
     return this->dict_reader_lst_;
 }
 
-void MockParamDict::SetDictReaderLst(std::vector<AbsDictReaderPtr> lst) {
+void RocksDBParamDict::SetDictReaderLst(std::vector<AbsDictReaderPtr> lst) {
     this->dict_reader_lst_ = lst;
 }
 
-std::vector<float> MockParamDict::GetSparseValue(std::string feasign, std::string slot) {
+std::vector<float> RocksDBParamDict::GetSparseValue(std::string feasign, std::string slot) {
     auto BytesToFloat = [](uint8_t* byteArray){
         return *((float*)byteArray);
     };
@@ -100,15 +100,15 @@ std::vector<float> MockParamDict::GetSparseValue(std::string feasign, std::strin
     return value;
 }
 
-std::vector<float> MockParamDict::GetSparseValue(int64_t feasign, int64_t slot) {
+std::vector<float> RocksDBParamDict::GetSparseValue(int64_t feasign, int64_t slot) {
     return this->GetSparseValue(std::to_string(feasign), std::to_string(slot));
 }
 
-bool MockParamDict::InsertSparseValue(int64_t feasign, int64_t slot, const std::vector<float>& values) {
+bool RocksDBParamDict::InsertSparseValue(int64_t feasign, int64_t slot, const std::vector<float>& values) {
     return this->InsertSparseValue(std::to_string(feasign), std::to_string(slot), values);       
 }
 
-bool MockParamDict::InsertSparseValue(std::string feasign, std::string slot, const std::vector<float>& values) {
+bool RocksDBParamDict::InsertSparseValue(std::string feasign, std::string slot, const std::vector<float>& values) {
     auto FloatToBytes = [](float fvalue, uint8_t *arr){
         unsigned char  *pf = nullptr;
         unsigned char *px = nullptr;
@@ -136,12 +136,12 @@ bool MockParamDict::InsertSparseValue(std::string feasign, std::string slot, con
     return true;
 }
 
-void MockParamDict::UpdateBaseModel() {
+void RocksDBParamDict::UpdateBaseModel() {
    std::thread t([&] () {
         for (AbsDictReaderPtr dict_reader: this->dict_reader_lst_) {
             if (dict_reader->CheckDiff()) {
                 std::vector<std::string> strs;
-                dict_reader->Read(strs);
+                dict_reader->Read(this);
                 for (const std::string& str: strs) {
                     std::vector<std::string> arr;
                     std::istringstream in(str);
@@ -162,27 +162,27 @@ void MockParamDict::UpdateBaseModel() {
 }
 
 
-void MockParamDict::UpdateDeltaModel() {
+void RocksDBParamDict::UpdateDeltaModel() {
     UpdateBaseModel();
 }
 
-std::pair<AbsKVDBPtr, AbsKVDBPtr> MockParamDict::GetKVDB()  {
+std::pair<AbsKVDBPtr, AbsKVDBPtr> RocksDBParamDict::GetKVDB()  {
     return {front_db, back_db};
 }
 
-void MockParamDict::SetKVDB(std::pair<AbsKVDBPtr, AbsKVDBPtr> kvdbs) {
+void RocksDBParamDict::SetKVDB(std::pair<AbsKVDBPtr, AbsKVDBPtr> kvdbs) {
     this->front_db = kvdbs.first;
     this->back_db = kvdbs.second;
 }
 
-void MockParamDict::CreateKVDB() {
+void RocksDBParamDict::CreateKVDB() {
     this->front_db = std::make_shared<RocksKVDB>();
     this->back_db = std::make_shared<RocksKVDB>();
     this->front_db->CreateDB();
     this->back_db->CreateDB();
 }
 
-MockParamDict::~MockParamDict() {
+RocksDBParamDict::~RocksDBParamDict() {
 
 }
 

kvdb/src/rockskvdb_impl.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 
 int RocksKVDB::db_count;
 void RocksKVDB::CreateDB() {

kvdb/src/test_rocksdb.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "kvdb/mock_kvdb_impl.h"
+#include "kvdb/rocksdb_impl.h"
 #include "kvdb/paddle_rocksdb.h"
 #include <iostream>
 void test_rockskvdb() {