From b7f2b395590b731a40996602dc6f8d63faa6c550 Mon Sep 17 00:00:00 2001 From: groot Date: Sun, 23 Jun 2019 09:55:12 +0800 Subject: [PATCH 1/4] change port Former-commit-id: b4f3d82c64fafe3b135644409f056b85ef02a818 --- cpp/conf/server_config.yaml | 4 ++-- cpp/src/sdk/examples/simple/main.cpp | 4 ++-- cpp/src/server/MilvusServer.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/conf/server_config.yaml b/cpp/conf/server_config.yaml index a94d56d5ac..717e9b10cb 100644 --- a/cpp/conf/server_config.yaml +++ b/cpp/conf/server_config.yaml @@ -1,10 +1,10 @@ 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 diff --git a/cpp/src/sdk/examples/simple/main.cpp b/cpp/src/sdk/examples/simple/main.cpp index 722d40de4f..499b8a9935 100644 --- a/cpp/src/sdk/examples/simple/main.cpp +++ b/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 diff --git a/cpp/src/server/MilvusServer.cpp b/cpp/src/server/MilvusServer.cpp index f738c46711..5e42eb3d7a 100644 --- a/cpp/src/server/MilvusServer.cpp +++ b/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"); From 1366ff1422dccd9647566f6b66dbbc94f1553f89 Mon Sep 17 00:00:00 2001 From: groot Date: Sun, 23 Jun 2019 10:04:18 +0800 Subject: [PATCH 2/4] mute log Former-commit-id: 090152fcebd69beec8fbeda27d8c1b91aa86f001 --- cpp/conf/log_config.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/conf/log_config.conf b/cpp/conf/log_config.conf index 9ad4219637..80710b570e 100644 --- a/cpp/conf/log_config.conf +++ b/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 From dff1648035633d94459d08c8217d7838e353c4e6 Mon Sep 17 00:00:00 2001 From: groot Date: Sun, 23 Jun 2019 11:32:20 +0800 Subject: [PATCH 3/4] set default version Former-commit-id: 6dc0de13fdb7254496b2624368c9d648e7ffb8c4 --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index e745e87d35..05cbc1db64 100644 --- a/cpp/CMakeLists.txt +++ b/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}") From f0bb92fb45e34ca513a8b7311b722eccea5ea950 Mon Sep 17 00:00:00 2001 From: groot Date: Sun, 23 Jun 2019 12:51:11 +0800 Subject: [PATCH 4/4] fix typo Former-commit-id: 42f539179307d39773762fd2df50fe99b3590f96 --- cpp/src/db/DBMetaImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp index 9174663395..779307e8a6 100644 --- a/cpp/src/db/DBMetaImpl.cpp +++ b/cpp/src/db/DBMetaImpl.cpp @@ -193,7 +193,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); } }