Commit fc5a6b3c authored by 余昆's avatar 余昆
Browse files

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk 


Former-commit-id: dd16511856cac95f72d9dbb07301f5c11ffebeb9
parents 96c2f9ca 325bb1dc

ci/jenkinsfile/milvus_build.groovy

+1 −1
Original line number Diff line number Diff line 
container('milvus-build-env') {

    timeout(time: 40, unit: 'MINUTES') {

    timeout(time: 120, unit: 'MINUTES') {

        gitlabCommitStatus(name: 'Build Engine') {

            dir ("milvus_engine") {

                try {

ci/jenkinsfile/milvus_build_no_ut.groovy

+1 −1
Original line number Diff line number Diff line 
container('milvus-build-env') {

    timeout(time: 40, unit: 'MINUTES') {

    timeout(time: 120, unit: 'MINUTES') {

        gitlabCommitStatus(name: 'Build Engine') {

            dir ("milvus_engine") {

                try {

core/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-647 - [monitor] grafana display average cpu-temp

- MS-644 - Search crashed with index-type: flat

- MS-624 - Search vectors failed if time ranges long enough

- MS-652 - IVFSQH quantization double free



## Improvement

- MS-552 - Add and change the easylogging library

core/cmake/ThirdPartyPackages.cmake

+8 −4
Original line number Diff line number Diff line
@@ -158,6 +158,10 @@ if(USE_JFROG_CACHE STREQUAL "ON") 
    endif()



    set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache")

    if(NOT EXISTS ${THIRDPARTY_PACKAGE_CACHE})

        message(STATUS "Will create cached directory: ${THIRDPARTY_PACKAGE_CACHE}")

        file(MAKE_DIRECTORY ${THIRDPARTY_PACKAGE_CACHE})

    endif()

endif()



macro(resolve_dependency DEPENDENCY_NAME)
@@ -324,8 +328,8 @@ if(DEFINED ENV{MILVUS_SQLITE_ORM_URL}) 
    set(SQLITE_ORM_SOURCE_URL "$ENV{MILVUS_SQLITE_ORM_URL}")

else()

    set(SQLITE_ORM_SOURCE_URL

            "http://192.168.1.105:6060/Test/sqlite_orm/-/archive/master/sqlite_orm-master.zip")

#            "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip")

#            "http://192.168.1.105:6060/Test/sqlite_orm/-/archive/master/sqlite_orm-master.zip")

            "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip")

endif()

set(SQLITE_ORM_MD5 "ba9a405a8a1421c093aa8ce988ff8598")
@@ -370,9 +374,9 @@ if(DEFINED ENV{MILVUS_GRPC_URL}) 
    set(GRPC_SOURCE_URL "$ENV{MILVUS_GRPC_URL}")

else()

    set(GRPC_SOURCE_URL

            "http://git.zilliz.tech/kun.yu/grpc/-/archive/master/grpc-master.tar.gz")

            "https://github.com/youny626/grpc-milvus/archive/${GRPC_VERSION}.zip")

endif()

set(GRPC_MD5 "7ec59ad54c85a12dcbbfede09bf413a9")

set(GRPC_MD5 "0362ba219f59432c530070b5f5c3df73")





# ----------------------------------------------------------------------

core/src/index/cmake/ThirdPartyPackagesCore.cmake

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ endif() 
if(USE_JFROG_CACHE STREQUAL "ON")

    set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}")

    set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache")

    if(NOT EXISTS ${THIRDPARTY_PACKAGE_CACHE})

        message(STATUS "Will create cached directory: ${THIRDPARTY_PACKAGE_CACHE}")

        file(MAKE_DIRECTORY ${THIRDPARTY_PACKAGE_CACHE})

    endif()

endif()



macro(resolve_dependency DEPENDENCY_NAME)