Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-463 Search timeout

See merge request megasearch/milvus!471

Former-commit-id: 54cf3521d710116cc87525d434c0f7c6962abe41

cpp/CHANGELOG.md

@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-449 - Add vectors twice success, once with ids, the other no ids
 - MS-461 - Mysql meta unittest failed
 - MS-462 - Run milvus server twices, should display error
+- MS-463 - Search timeout
 
 ## Improvement
 - MS-327 - Clean code for milvus

cpp/conf/server_config.template

@@ -83,9 +83,13 @@ resource_config:
 #      enable_executor: true
 
   # connection list, length: 0~N
-  # format: -${resource_name}===${resource_name}
+      # format: -${resource_name}===${resource_name}
   connections:
-    - ssda===cpu
-    - cpu===gpu0
+    io:
+      speed: 500
+      endpoint: ssda===cpu
+    pcie:
+      speed: 11000
+      endpoint: cpu===gpu0
 #    - cpu===gtx1660
 

cpp/src/server/ServerConfig.h

@@ -58,7 +58,7 @@ static const char* CONFIG_RESOURCE_ENABLE_LOADER = "enable_loader";
 static const char* CONFIG_RESOURCE_ENABLE_EXECUTOR = "enable_executor";
 static const char* CONFIG_RESOURCE_CONNECTIONS = "connections";
 static const char* CONFIG_SPEED_CONNECTIONS = "speed";
-static const char* CONFIG_ENDPOINT_CONNECTIONS = "connections";
+static const char* CONFIG_ENDPOINT_CONNECTIONS = "endpoint";
 
 
 class ServerConfig {