Commit e5f4c07b authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #81 from yhmo/0.5.1 

#80 Print version information into log during server start

Former-commit-id: 1497654a1905eabaa2b1c3ebdf796c8de80a6171
parents 980913c8 774f13d7

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Please mark all change in change log and use the ticket from JIRA. 
## Bug

## Improvement

- \#64 - Improvement dump function in scheduler

- \#80 - Print version information into log during server start

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



## Feature

core/CMakeLists.txt

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



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

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.macro ${CMAKE_CURRENT_SOURCE_DIR}/version.h)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.macro ${CMAKE_CURRENT_SOURCE_DIR}/src/version.h)



message(STATUS "Milvus version: "

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

core/coverage.sh

+2 −2
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "*/src/server/Server.cpp" \

    "*/src/server/DBWrapper.cpp" \

    "*/src/server/grpc_impl/GrpcServer.cpp" \

    "*/src/external/easyloggingpp/easylogging++.h" \

    "*/src/external/easyloggingpp/easylogging++.cc" \

    "*/easylogging++.h" \

    "*/easylogging++.cc" \

    "*/src/external/*"



if [ $? -ne 0 ]; then

core/src/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <cstring>

#include <string>



#include "../version.h"

#include "external/easyloggingpp/easylogging++.h"

#include "metrics/Metrics.h"

#include "server/Server.h"

#include "src/version.h"

#include "utils/CommonUtil.h"

#include "utils/SignalUtil.h"

core/src/sdk/grpc/ClientProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
// under the License.



#include "sdk/grpc/ClientProxy.h"

#include "../../../version.h"

#include "grpc/gen-milvus/milvus.grpc.pb.h"

#include "src/version.h"



#include <memory>

#include <string>