Commit bf20a699 authored by 王翔宇's avatar 王翔宇
Browse files

solve conflicts 


Former-commit-id: 3f781d0cf053bc2ec93354990d606a08e80cebe2
parents 0d60f99f 30b0d24f

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#80 - Print version information into log during server start

- \#82 - Move easyloggingpp into "external" directory

- \#92 - Speed up CMake build process

- \#96 - Remove .a file in milvus/lib for docker-version

- \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss



>>>>>>> main/0.5.1

## Feature

- \#115 - Using new structure for tasktable

README.md

+8 −4
Original line number Diff line number Diff line 


![Milvuslogo](https://github.com/milvus-io/docs/blob/master/assets/milvus_logo.png)





![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen)

![Language](https://img.shields.io/badge/language-C%2B%2B-blue)

[![codebeat badge](https://codebeat.co/badges/e030a4f6-b126-4475-a938-4723d54ec3a7?style=plastic)](https://codebeat.co/projects/github-com-jinhai-cn-milvus-master)

![Release](https://img.shields.io/badge/release-v0.5.0-orange)

![Release_date](https://img.shields.io/badge/release_date-October-yellowgreen)



- [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk)

- [Twitter](https://twitter.com/milvusio)
@@ -21,7 +24,7 @@ Milvus is an open source similarity search engine for massive feature vectors. D 


Milvus provides stable Python, Java and C++ APIs.



Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://milvus.io/docs/en/Releases/v0.5.0/).

Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://milvus.io/docs/en/release/v0.5.0/).



- Heterogeneous computing
@@ -89,7 +92,7 @@ Use Docker to install Milvus is a breeze. See the [Milvus install guide](https:/ 


```shell

$ cd [Milvus sourcecode path]/core

./ubuntu_build_deps.sh

$ ./ubuntu_build_deps.sh

```



##### Step 2 Build
@@ -167,7 +170,7 @@ Refer to [this link](https://github.com/milvus-io/milvus-sdk-java/tree/master/ex 


## Contribution guidelines



Contributions are welcomed and greatly appreciated. If you want to contribute to Milvus, please read our [contribution guidelines](CONTRIBUTING.md). This project adheres to the [code of conduct](CODE_OF_CONDUCT.md) of Milvus. By participating, you are expected to uphold this code.

Contributions are welcomed and greatly appreciated. Please read our [contribution guidelines](CONTRIBUTING.md) for detailed contribution workflow. This project adheres to the [code of conduct](CODE_OF_CONDUCT.md) of Milvus. By participating, you are expected to uphold this code.



We use [GitHub issues](https://github.com/milvus-io/milvus/issues/new/choose) to track issues and bugs. For general questions and public discussions, please join our community.
@@ -196,5 +199,6 @@ Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upc 


## License



[Apache 2.0 license](LICENSE)

[Apache License 2.0](LICENSE)

ci/jenkins/Jenkinsfile

+7 −3
Original line number Diff line number Diff line 
String cron_timezone = "TZ=Asia/Shanghai"

String cron_string = BRANCH_NAME == "master" ? "H 0 * * * " : ""

cron_string =  BRANCH_NAME == "0.5.1" ? "H 1 * * * " : cron_string



pipeline {

    agent none



    triggers { cron(cron_string) }

    triggers {

        cron """${cron_timezone}

            ${cron_string}"""

    }



    options {

        timestamps()

ci/jenkins/jenkinsfile/deploySingle2Dev.groovy

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ sh 'helm repo update' 
dir ('milvus-helm') {

    checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

    dir ("milvus-gpu") {

        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/sqlite_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    }

}

ci/jenkins/jenkinsfile/singleDevTest.groovy

+16 −14
Original line number Diff line number Diff line
@@ -4,19 +4,21 @@ timeout(time: 60, unit: 'MINUTES') { 
        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu-milvus-gpu-engine.milvus.svc.cluster.local"

    }

    // mysql database backend test

    load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy"

    // load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy"



    if (!fileExists('milvus-helm')) {

        dir ("milvus-helm") {

            checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

        }

    }

    dir ("milvus-helm") {

        dir ("milvus-gpu") {

            sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

        }

    }

    dir ("tests/milvus_python_test") {

        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu-milvus-gpu-engine.milvus.svc.cluster.local"

    }

    // Remove mysql-version tests: 10-28



    // if (!fileExists('milvus-helm')) {

    //     dir ("milvus-helm") {

    //         checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

    //     }

    // }

    // dir ("milvus-helm") {

    //     dir ("milvus-gpu") {

    //         sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //     }

    // }

    // dir ("tests/milvus_python_test") {

    //     sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu-milvus-gpu-engine.milvus.svc.cluster.local"

    // }

}