Merge remote-tracking branch 'upstream/branch-0.3.0' into mysql-0.3.0

Former-commit-id: ecac005be05ab0f377512e9cd6055deac4520f1b

cpp/CMakeLists.txt

@@ -51,8 +51,8 @@ set(MILVUS_VERSION_PATCH "${milvus_VERSION_PATCH}")
 if(MILVUS_VERSION_MAJOR STREQUAL ""
         OR MILVUS_VERSION_MINOR STREQUAL ""
         OR MILVUS_VERSION_PATCH STREQUAL "")
-    message(WARNING "Failed to determine Milvus version from '${MILVUS_VERSION}'")
-    set(MILVUS_VERSION "unknown")
+    message(WARNING "Failed to determine Milvus version from git branch name")
+    set(MILVUS_VERSION "0.3.0")
 endif()
 
 message(STATUS "Build version = ${MILVUS_VERSION}")

cpp/conf/log_config.conf

@@ -3,7 +3,7 @@
     FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%H:%m}-global.log"
     ENABLED                 =   true
     TO_FILE                 =   true
-    TO_STANDARD_OUTPUT      =   true
+    TO_STANDARD_OUTPUT      =   false
     SUBSECOND_PRECISION     =   3
     PERFORMANCE_TRACKING    =   false
     MAX_LOG_FILE_SIZE       =   2097152 ## Throw log files away after 2MB
@@ -17,7 +17,7 @@
 * VERBOSE:
     FORMAT                  =   "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
     TO_FILE                 =   false
-    TO_STANDARD_OUTPUT      =   true
+    TO_STANDARD_OUTPUT      =   false
 ## Error logs
 * ERROR:
     ENABLED                 =   false

cpp/conf/server_config.yaml

 server_config:
   address: 0.0.0.0
-  port: 33001
+  port: 19530
   transfer_protocol: binary   #optional: binary, compact, json
   server_mode: thread_pool    #optional: simple, thread_pool
   gpu_index: 0                #which gpu to be used
-  mode: single                 #optional: single, cluster
+  mode: single                #optional: single, cluster
 
 db_config:
   db_path: /tmp/milvus

cpp/src/db/DBMetaImpl.cpp

@@ -194,7 +194,7 @@ Status DBMetaImpl::CreateTable(TableSchema &table_schema) {
                                                where(c(&TableSchema::table_id_) == table_schema.table_id_));
             if (table.size() == 1) {
                 std::string msg = (TableSchema::TO_DELETE == std::get<0>(table[0])) ?
-                        "Table already exists" : "Table already exists and it is in delete state, please wait a second";
+                          "Table already exists and it is in delete state, please wait a second" : "Table already exists";
                 return Status::Error(msg);
             }
         }

cpp/src/sdk/examples/simple/main.cpp

@@ -25,7 +25,7 @@ main(int argc, char *argv[]) {
                                            {NULL, 0, 0, 0}};
 
     int option_index = 0;
-    std::string address = "127.0.0.1", port = "33001";
+    std::string address = "127.0.0.1", port = "19530";
     app_name = argv[0];
 
     int value;
@@ -62,7 +62,7 @@ print_help(const std::string &app_name) {
     printf("\n Usage: %s [OPTIONS]\n\n", app_name.c_str());
     printf("  Options:\n");
     printf("   -s --server   Server address, default 127.0.0.1\n");
-    printf("   -p --port     Server port, default 33001\n");
+    printf("   -p --port     Server port, default 19530\n");
     printf("   -h --help     Print help information\n");
     printf("\n");
 }
\ No newline at end of file

cpp/src/server/MilvusServer.cpp

@@ -47,7 +47,7 @@ MilvusServer::StartService() {
     ConfigNode server_config = config.GetConfig(CONFIG_SERVER);
 
     std::string address = server_config.GetValue(CONFIG_SERVER_ADDRESS, "127.0.0.1");
-    int32_t port = server_config.GetInt32Value(CONFIG_SERVER_PORT, 33001);
+    int32_t port = server_config.GetInt32Value(CONFIG_SERVER_PORT, 19530);
     std::string protocol = server_config.GetValue(CONFIG_SERVER_PROTOCOL, "binary");
     std::string mode = server_config.GetValue(CONFIG_SERVER_MODE, "thread_pool");