From dff1648035633d94459d08c8217d7838e353c4e6 Mon Sep 17 00:00:00 2001 From: groot Date: Sun, 23 Jun 2019 11:32:20 +0800 Subject: [PATCH 1/2] 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 2/2] 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); } }