From d31d27417626dd374d658d1f6cb77a09d78e2a11 Mon Sep 17 00:00:00 2001 From: starlord Date: Tue, 15 Oct 2019 14:37:39 +0800 Subject: [PATCH] specify mysql setting in coverage.sh Former-commit-id: 41a8eff3a502a5df519801983e65a457cf818e12 --- core/README.md | 17 +++++++++++++---- core/build.sh | 7 ------- core/coverage.sh | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/core/README.md b/core/README.md index 6e81b567..7a396335 100644 --- a/core/README.md +++ b/core/README.md @@ -76,13 +76,13 @@ $ sudo ln -s /path/to/libmysqlclient.so /path/to/libmysqlclient_r.so ###### Step 2 Build ```shell -$ cd [Milvus sourcecode path]/cpp +$ cd [Milvus sourcecode path]/core $ ./build.sh -t Debug or $ ./build.sh -t Release ``` -When the build is completed, all the stuff that you need in order to run Milvus will be installed under `[Milvus root path]/cpp/milvus`. +When the build is completed, all the stuff that you need in order to run Milvus will be installed under `[Milvus root path]/core/milvus`. If you encounter the following error message, `protocol https not supported or disabled in libcurl` @@ -148,11 +148,20 @@ $ sudo apt-get install lcov ```shell $ ./build.sh -u -c ``` +Run mysql docker +```shell +docker pull mysql:latest +docker run -p 3306:3306 -e MYSQL_ROOT_PASSWORD=123456 -d mysql:latest +``` +Run code coverage +```shell +$ ./coverage.sh -u root -p 123456 -t 127.0.0.1 +``` ##### Launch Milvus server ```shell -$ cd [Milvus root path]/cpp/milvus +$ cd [Milvus root path]/core/milvus ``` Add `lib/` directory to `LD_LIBRARY_PATH` @@ -202,7 +211,7 @@ $ python3 example.py ```shell # Run Milvus C++ example - $ cd [Milvus root path]/cpp/milvus/bin + $ cd [Milvus root path]/core/milvus/bin $ ./sdk_simple ``` diff --git a/core/build.sh b/core/build.sh index e1525377..a9d1aa0b 100755 --- a/core/build.sh +++ b/core/build.sh @@ -136,11 +136,4 @@ else fi make install || exit 1 - - # evaluate code coverage - if [[ ${BUILD_COVERAGE} == "ON" ]]; then - cd - - bash `pwd`/coverage.sh - cd - - fi fi \ No newline at end of file diff --git a/core/coverage.sh b/core/coverage.sh index fc49d6d6..55c70d7e 100755 --- a/core/coverage.sh +++ b/core/coverage.sh @@ -3,8 +3,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/milvus/lib MYSQL_USER_NAME=root -MYSQL_PASSWORD=Fantast1c -MYSQL_HOST='192.168.1.194' +MYSQL_PASSWORD=123456 +MYSQL_HOST='127.0.0.1' MYSQL_PORT='3306' while getopts "u:p:t:h" arg -- GitLab