Commit 3162d53f authored by JinHai-CN's avatar JinHai-CN
Browse files

Merge from main branch 


Former-commit-id: c8574dd1298c821b203ca9480a89f46932f98cb2
parents 2069344a 6d0e69b0

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-624 - Search vectors failed if time ranges long enough

- MS-652 - IVFSQH quantization double free

- MS-605 - Server going down during searching vectors

- MS-654 - Describe index timeout when building index



## Improvement

- MS-552 - Add and change the easylogging library
@@ -43,6 +44,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-614 - Preload table at startup

- MS-626 - Refactor DataObj to support cache any type data

- MS-648 - Improve unittest

- MS-655 - Upgrade SPTAG



## New Feature

- MS-627 - Integrate new index: IVFSQHybrid

core/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR}) 
set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR})

set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



include(ExternalProject)

include(DefineOptions)

include(BuildUtils)

core/cmake/BuildUtils.cmake

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ function(ExternalProject_Create_Cache project_name package_file install_path cac 
        file(REMOVE ${package_file})

    endif()



    string(REGEX REPLACE "(.+)/.+$" "\\1" package_dir ${package_file})

    if(NOT EXISTS ${package_dir})

        file(MAKE_DIRECTORY ${package_dir})

    endif()



    message(STATUS "Will create cached package file: ${package_file}")



    ExternalProject_Add_Step(${project_name} package