admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.0' into 'branch-0.3.0'

Browse Source 
set default version

See merge request megasearch/vecwise_engine!115

Former-commit-id: 520756c69653b83e4f385df8b741dce784163e26
This commit is contained in:
jinhai 2019-06-23 12:53:43 +08:00
commit 68767a9fe6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/CMakeLists.txt
View File

@ -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}")

2
cpp/src/db/DBMetaImpl.cpp
View File

@ -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);
}
}