Commit f0122999 authored by peng.xu's avatar peng.xu
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

disable clang-tidy

See merge request megasearch/milvus!674

Former-commit-id: 4aa54bc8e777e36d7731ec89901290a63f14a5e4
parents 8e36644e ae147799

cpp/build.sh

+7 −7
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
    fi

    echo "clang-format check passed!"



    # clang-tidy check

    make check-clang-tidy

    if [ $? -ne 0 ]; then

        echo "ERROR! clang-tidy check failed"

        exit 1

    fi

    echo "clang-tidy check passed!"

#    # clang-tidy check

#    make check-clang-tidy

#    if [ $? -ne 0 ]; then

#        echo "ERROR! clang-tidy check failed"

#        exit 1

#    fi

#    echo "clang-tidy check passed!"

else

    # compile and build

    make -j 4 || exit 1

cpp/src/utils/ValidationUtil.cpp

+5 −1
Original line number Diff line number Diff line
@@ -71,7 +71,11 @@ ValidationUtil::ValidateTableName(const std::string& table_name) { 


Status

ValidationUtil::ValidateTableDimension(int64_t dimension) {

    if (dimension <= 0 || dimension > TABLE_DIMENSION_LIMIT) {

    if (dimension <= 0) {

        std::string msg = "Dimension value should be greater than 0";

        SERVER_LOG_ERROR << msg;

        return Status(SERVER_INVALID_VECTOR_DIMENSION, msg);

    } else if (dimension > TABLE_DIMENSION_LIMIT) {

        std::string msg = "Table dimension excceed the limitation: " + std::to_string(TABLE_DIMENSION_LIMIT);

        SERVER_LOG_ERROR << msg;

        return Status(SERVER_INVALID_VECTOR_DIMENSION, msg);