Merge branch 'branch-0.5.0' into 'branch-0.5.0'

specify mysql setting in coverage.sh

See merge request megasearch/milvus!728

Former-commit-id: 5194a330453bd301ef59cf9741c69d386c532a50
This commit is contained in:
jinhai 2019-10-15 14:39:20 +08:00
commit 650000f2cd
3 changed files with 15 additions and 13 deletions

View File

@ -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
```

View File

@ -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

View File

@ -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