Merge pull request #219 from cydrain/caiyd_opt_unittest

#208 optimize unittest to support run single test more easily

CHANGELOG.md

@@ -9,6 +9,7 @@ Please mark all change in change log and use the ticket from JIRA.
 
 ## Improvement
 - \#207 - Add more unittest for config set/get
+- \#208 - optimize unittest to support run single test more easily
 
 ## Task
 

core/src/server/Config.cpp

@@ -795,11 +795,16 @@ Config::GetConfigStr(const std::string& parent_key, const std::string& child_key
 }
 
 std::string
-Config::GetConfigSequenceStr(const std::string& parent_key, const std::string& child_key, const std::string& delim) {
+Config::GetConfigSequenceStr(const std::string& parent_key, const std::string& child_key, const std::string& delim,
+                             const std::string& default_value) {
     std::string value;
     if (!GetConfigValueInMem(parent_key, child_key, value).ok()) {
         std::vector<std::string> sequence = GetConfigNode(parent_key).GetSequence(child_key);
+        if (sequence.empty()) {
+            value = default_value;
+        } else {
             server::StringHelpFunctions::MergeStringWithDelimeter(sequence, delim, value);
+        }
         SetConfigValueInMem(parent_key, child_key, value);
     }
     return value;
@@ -1028,8 +1033,9 @@ Config::GetResourceConfigMode(std::string& value) {
 
 Status
 Config::GetResourceConfigSearchResources(std::vector<std::string>& value) {
-    std::string str = GetConfigSequenceStr(CONFIG_RESOURCE, CONFIG_RESOURCE_SEARCH_RESOURCES,
-                                           CONFIG_RESOURCE_SEARCH_RESOURCES_DELIMITER);
+    std::string str =
+        GetConfigSequenceStr(CONFIG_RESOURCE, CONFIG_RESOURCE_SEARCH_RESOURCES,
+                             CONFIG_RESOURCE_SEARCH_RESOURCES_DELIMITER, CONFIG_RESOURCE_SEARCH_RESOURCES_DEFAULT);
     server::StringHelpFunctions::SplitStringByDelimeter(str, CONFIG_RESOURCE_SEARCH_RESOURCES_DELIMITER, value);
     return CheckResourceConfigSearchResources(value);
 }

core/src/server/Config.h

@@ -186,7 +186,8 @@ class Config {
     std::string
     GetConfigStr(const std::string& parent_key, const std::string& child_key, const std::string& default_value = "");
     std::string
-    GetConfigSequenceStr(const std::string& parent_key, const std::string& child_key, const std::string& delim);
+    GetConfigSequenceStr(const std::string& parent_key, const std::string& child_key, const std::string& delim = ",",
+                         const std::string& default_value = "");
 
  public:
     /* server config */

core/unittest/db/CMakeLists.txt

@@ -17,8 +17,16 @@
 # under the License.
 #-------------------------------------------------------------------------------
 
-
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} test_files)
+set(test_files
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_db.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_db_mysql.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_engine.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_mem.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_meta.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_meta_mysql.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_misc.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_search.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp)
 
 cuda_add_executable(test_db
         ${common_files}

core/unittest/db/utils.cpp

@@ -60,8 +60,8 @@ static const char
                    "    port: 8080                      # port prometheus used to fetch metrics\n"
                    "\n"
                    "cache_config:\n"
-                   "  cpu_mem_capacity: 16              # GB, CPU memory used for cache\n"
-                   "  cpu_mem_threshold: 0.85           # percentage of data kept when cache cleanup triggered\n"
+                   "  cpu_cache_capacity: 16              # GB, CPU memory used for cache\n"
+                   "  cpu_cache_threshold: 0.85           # percentage of data kept when cache cleanup triggered\n"
                    "  cache_insert_data: false          # whether load inserted data into cache\n"
                    "\n"
                    "engine_config:\n"

core/unittest/metrics/CMakeLists.txt

@@ -17,7 +17,11 @@
 # under the License.
 #-------------------------------------------------------------------------------
 
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} test_files)
+set(test_files
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_metricbase.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_metrics.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_prometheus.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp)
 
 add_executable(test_metrics
         ${common_files}

core/unittest/scheduler/CMakeLists.txt

@@ -17,7 +17,17 @@
 # under the License.
 #-------------------------------------------------------------------------------
 
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} test_files)
+set(test_files
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_algorithm.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_event.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_node.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_normal.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_resource.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_resource_factory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_resource_mgr.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_scheduler.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_task.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_tasktable.cpp)
 
 cuda_add_executable(test_scheduler
         ${common_files}

core/unittest/server/CMakeLists.txt

@@ -17,7 +17,12 @@
 # under the License.
 #-------------------------------------------------------------------------------
 
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} test_files)
+set(test_files
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_cache.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_config.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_rpc.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_util.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp)
 
 include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")
 link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")

core/unittest/wrapper/CMakeLists.txt

@@ -17,7 +17,11 @@
 # under the License.
 #-------------------------------------------------------------------------------
 
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} test_files)
+set(test_files
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_hybrid_index.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_knowhere.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_wrapper.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp)
 
 set(wrapper_files
         ${MILVUS_ENGINE_SRC}/wrapper/DataTransfer.cpp

core/unittest/wrapper/utils.cpp

@@ -50,8 +50,8 @@ static const char
                    "    port: 8080                      # port prometheus used to fetch metrics\n"
                    "\n"
                    "cache_config:\n"
-                   "  cpu_mem_capacity: 16              # GB, CPU memory used for cache\n"
-                   "  cpu_mem_threshold: 0.85           # percentage of data kept when cache cleanup triggered\n"
+                   "  cpu_cache_capacity: 16              # GB, CPU memory used for cache\n"
+                   "  cpu_cache_threshold: 0.85           # percentage of data kept when cache cleanup triggered\n"
                    "  cache_insert_data: false          # whether load inserted data into cache\n"
                    "\n"
                    "engine_config:\n"