Commit c91f0b0a authored by jinhai's avatar jinhai
Browse files

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: f04ff77ac7da0d0d53ab98bebc4e8cfb41e5a859
parents 4c538f1a d570972e

core/README.md

+13 −4
Original line number Diff line number Diff line
@@ -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

```

core/build.sh

+0 −7
Original line number Diff line number Diff line
@@ -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

core/coverage.sh

+2 −2
Original line number Diff line number Diff line
@@ -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