milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixBug' into 'branch-0.4.0' 

MS-467: fix mysql db test bug

See merge request megasearch/milvus!474

Former-commit-id: 393ee7e7bae6fc0f77d3b0b732cd74ee07faf9a8
pull/191/head
jinhai 2019-09-03 17:06:00 +08:00
parent e940d3c4b0 e22d86d069
commit 79a861ed21
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -22,6 +22,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-461 - Mysql meta unittest failed - MS-461 - Mysql meta unittest failed
- MS-462 - Run milvus server twices, should display error - MS-462 - Run milvus server twices, should display error
- MS-463 - Search timeout - MS-463 - Search timeout
- MS-467 - mysql db test failed
## Improvement ## Improvement
- MS-327 - Clean code for milvus - MS-327 - Clean code for milvus

7
cpp/unittest/db/utils.cpp
View File

@ -124,7 +124,12 @@ zilliz::milvus::engine::DBMetaOptions MySQLTest::getDBMetaOptions() {
zilliz::milvus::engine::Options MySQLDBTest::GetOptions() { zilliz::milvus::engine::Options MySQLDBTest::GetOptions() {
auto options = engine::OptionsFactory::Build(); auto options = engine::OptionsFactory::Build();
options.meta.path = "/tmp/milvus_test"; options.meta.path = "/tmp/milvus_test";
options.meta.backend_uri = "mysql://root:Fantast1c@192.168.1.194:3306/"; options.meta.backend_uri = DBTestEnvironment::getURI();
if(options.meta.backend_uri.empty()) {
options.meta.backend_uri = "mysql://root:Fantast1c@192.168.1.194:3306/";
}
return options; return options;
} }