Commit 964d1bfb authored by 余昆's avatar 余昆
Browse files

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

parents 35f17963 a47b7284

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#316 - Some files not merged after vectors added

- \#327 - Search does not use GPU when index type is FLAT

- \#340 - Test cases run failed on 0.6.0

- \#353 - Rename config.h.in to version.h.in

- \#374 - sdk_simple return empty result



## Feature
@@ -23,6 +24,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#275 - Rename C++ SDK IndexType

- \#284 - Change C++ SDK to shared library

- \#260 - C++ SDK README

- \#266 - Rpc request source code refactor

- \#314 - add Find FAISS in CMake

- \#310 - Add Q&A for 'protocol https not supported or disable in libcurl' issue

- \#322 - Add option to enable / disable prometheus

ci/jenkins/Jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


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

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



pipeline {

    agent none

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ if (MILVUS_VERSION_MAJOR STREQUAL "" 
endif()



message(STATUS "Build version = ${MILVUS_VERSION}")

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.h @ONLY)



message(STATUS "Milvus version: "

        "${MILVUS_VERSION_MAJOR}.${MILVUS_VERSION_MINOR}.${MILVUS_VERSION_PATCH} "

core/src/CMakeLists.txt

+7 −1
Original line number Diff line number Diff line
@@ -75,7 +75,13 @@ set(thirdparty_files 
        )



aux_source_directory(${MILVUS_ENGINE_SRC}/server server_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_server_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl/request grpc_request_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_impl_files)

set(grpc_server_files

        ${grpc_request_files}

        ${grpc_impl_files}

        )



aux_source_directory(${MILVUS_ENGINE_SRC}/utils utils_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/wrapper wrapper_files)

core/src/db/meta/MetaTypes.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "db/Constants.h"

#include "db/engine/ExecutionEngine.h"

#include "src/config.h"

#include "src/version.h"



#include <map>

#include <memory>