Commit c99b3b4a authored by xiaojun.lin's avatar xiaojun.lin
Browse files

Merge branch 'branch-0.5.0' into enable_nsg 

# Conflicts:
#	cpp/unittest/wrapper/wrapper_test.cpp


Former-commit-id: 4f7c4005a64b47a6c6874cd6c1db2e7e72b9f588
parents c6501ec0 afc55cca

.clang-format

+5 −0
Original line number Diff line number Diff line
@@ -18,3 +18,8 @@ 
BasedOnStyle:  Google

DerivePointerAlignment: false

ColumnLimit: 120

IndentWidth: 4

AccessModifierOffset: -3

AlwaysBreakAfterReturnType: All

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false

cpp/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ add_custom_target(lint 
                  --exclude_globs

                  ${LINT_EXCLUSIONS_FILE}

                  --source_dir

                  ${CMAKE_CURRENT_SOURCE_DIR}/src

                  ${CMAKE_CURRENT_SOURCE_DIR}

                  ${MILVUS_LINT_QUIET})



#

cpp/build-support/code_style_clion.xml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
<code_scheme name="Default" version="173">

  <Objective-C>

    <option name="INDENT_NAMESPACE_MEMBERS" value="0" />

    <option name="INDENT_VISIBILITY_KEYWORDS" value="1" />

    <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />

    <option name="KEEP_CASE_EXPRESSIONS_IN_ONE_LINE" value="true" />

    <option name="FUNCTION_NON_TOP_AFTER_RETURN_TYPE_WRAP" value="0" />

    <option name="FUNCTION_TOP_AFTER_RETURN_TYPE_WRAP" value="2" />

    <option name="FUNCTION_PARAMETERS_WRAP" value="5" />

    <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />

    <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />

    <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />

    <option name="CLASS_CONSTRUCTOR_INIT_LIST_WRAP" value="5" />

    <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />

    <option name="SPACE_BEFORE_PROTOCOLS_BRACKETS" value="false" />

    <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" />

    <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" />

    <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" />

    <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" />

    <option name="KEEP_BLANK_LINES_BEFORE_END" value="1" />

  </Objective-C>

  <codeStyleSettings language="ObjectiveC">

    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />

    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />

    <option name="BLANK_LINES_AROUND_CLASS" value="0" />

    <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />

    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />

    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />

    <option name="SPACE_AFTER_TYPE_CAST" value="false" />

    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />

    <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="false" />

    <option name="FOR_STATEMENT_WRAP" value="1" />

    <option name="ASSIGNMENT_WRAP" value="1" />

    <indentOptions>

      <option name="CONTINUATION_INDENT_SIZE" value="4" />

    </indentOptions>

  </codeStyleSettings>

</code_scheme>
 
 No newline at end of file

cpp/build-support/lint_exclusions.txt

+5 −3
Original line number Diff line number Diff line 
*cmake-build-debug*

*cmake-build-release*

*cmake_build*

*src/thirdparty*

*src/core/thirdparty*

*src/grpc*

*thirdparty*

*easylogging++*

*SqliteMetaImpl.cpp

*src/grpc*

*src/core*

*src/wrapper*
 
 No newline at end of file

cpp/build.sh

+18 −13
Original line number Diff line number Diff line
@@ -99,21 +99,26 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
    # cpplint check

    make lint

    if [ $? -ne 0 ]; then

        echo "ERROR! cpplint check not pass"

        exit 1

    fi

    # clang-format check

    make check-clang-format

    if [ $? -ne 0 ]; then

        echo "ERROR! clang-format check failed"

        exit 1

    fi

    # clang-tidy check

    make check-clang-tidy

    if [ $? -ne 0 ]; then

        echo "ERROR! clang-tidy check failed"

        echo "ERROR! cpplint check failed"

        exit 1

    fi

    echo "cpplint check passed!"



#    # clang-format check

#    make check-clang-format

#    if [ $? -ne 0 ]; then

#        echo "ERROR! clang-format check failed"

#        exit 1

#    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!"

else

    # compile and build

    make -j 4 || exit 1