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

Merge pull request #83 from scsven/dev 

Move easyloggingpp into external directory

Former-commit-id: 2b9396704f9d3e3881f481ae53e087513ea591a4
parents 73b371e7 2bf5973e

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

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



## Feature

## Task

ci/jenkins/scripts/coverage.sh

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,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/utils/easylogging++.h" \

    "*/src/utils/easylogging++.cc"

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

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



# gen html report

# ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/build-support/lint_exclusions.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ 
*easylogging++*

*SqliteMetaImpl.cpp

*src/grpc*

*src/external*

*milvus/include*
 
 No newline at end of file

core/coverage.sh

+3 −2
Original line number Diff line number Diff line
@@ -121,8 +121,9 @@ ${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/utils/easylogging++.h" \

    "*/src/utils/easylogging++.cc"

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

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

    "*/src/external/*"



# gen html report

${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/src/CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ set(scheduler_files 
        ${scheduler_task_files}

        )



aux_source_directory(${MILVUS_ENGINE_SRC}/external/easyloggingpp external_easyloggingpp_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/external/nlohmann external_nlohmann_files)

set(external_files

        ${external_easyloggingpp_files}

        ${external_nlohmann_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}/utils utils_files)
@@ -77,6 +84,7 @@ set(engine_files 
        ${db_insert_files}

        ${db_meta_files}

        ${metrics_files}

        ${external_files}

        ${utils_files}

        ${wrapper_files}

        )