Commit a22b6f39 authored by jielinxu's avatar jielinxu
Browse files

Merge remote-tracking branch 'upstream/master' into branch-0.5.0 


Former-commit-id: 2ebe5cf9693fa2b0178d814b6883c6d696986f2d
parents 55cd7f17 d3098ca9

CHANGELOG.md

+15 −5
Original line number Diff line number Diff line
@@ -2,6 +2,15 @@ 


Please mark all change in change log and use the ticket from JIRA.



# Milvus 0.5.1 (TODO)



## Bug

## Improvement

- \#64 - Improvement dump function in scheduler



## Feature

## Task



# Milvus 0.5.0 (2019-10-21)



## Bug
@@ -57,8 +66,9 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-648 - Improve unittest

- MS-655 - Upgrade SPTAG

- \#42 - Put union of index_build_device and search resources to gpu_pool

- \#67 - Avoid linking targets multiple times in cmake



## New Feature

## Feature

- MS-614 - Preload table at startup

- MS-627 - Integrate new index: IVFSQHybrid

- MS-631 - IVFSQ8H Index support
@@ -202,7 +212,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-576 - Scheduler refactor

- MS-592 - Change showtables stream transport to unary



## New Feature

## Feature

- MS-343 - Implement ResourceMgr

- MS-338 - NewAPI: refine code to support CreateIndex

- MS-339 - NewAPI: refine code to support DropIndex
@@ -263,7 +273,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-332 - Set grpc and thrift server run concurrently

- MS-352 - Add hybrid index



## New Feature

## Feature

- MS-180 - Add new mem manager

- MS-195 - Add nlist and use_blas_threshold conf

- MS-137 - Integrate knowhere
@@ -297,7 +307,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-126 - Add more error code

- MS-128 - Change default db path



## New Feature

## Feature



- MS-57 - Implement index load/search pipeline

- MS-56 - Add version information when server is started
@@ -342,7 +352,7 @@ Please mark all change in change log and use the ticket from JIRA. 


- MS-20 - Clean Code Part 1



## New Feature

## Feature



- MS-5 - Implement Auto Archive Feature

- MS-6 - Implement SDK interface part 1

NOTICE.md

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ 
| gperftools    | [BSD 3-Clause](https://github.com/gperftools/gperftools/blob/master/COPYING)                                                 |

| grpc          | [Apache 2.0](https://github.com/grpc/grpc/blob/master/LICENSE)                                                   |

| EASYLOGGINGPP | [MIT](https://github.com/zuhd-org/easyloggingpp/blob/master/LICENSEhttps://github.com/zuhd-org/easyloggingpp/blob/master/LICENSE)                                                          |

| Json          | [MIT](https://github.com/nlohmann/json/blob/develop/LICENSE.MIT)                                                          |

core/build.sh

+3 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ cd ${BUILD_OUTPUT_DIR} 


# remove make cache since build.sh -l use default variables

# force update the variables each time

make rebuild_cache

make rebuild_cache > /dev/null 2>&1



CMAKE_CMD="cmake \

-DBUILD_UNIT_TEST=${BUILD_UNITTEST} \
@@ -139,13 +139,12 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
#    fi

#    echo "clang-tidy check passed!"

else

    # compile and build

    make -j 4 || exit 1



    # strip binary symbol

    if [[ ${BUILD_TYPE} != "Debug" ]]; then

        strip src/milvus_server

    fi



    make install || exit 1

    # compile and build

    make -j 8 install || exit 1

fi
 
 No newline at end of file

core/src/external/nlohmann/json.hpp

0 → 100644
+22684 −0

File added.

Preview size limit exceeded, changes collapsed.

core/src/index/cmake/ThirdPartyPackagesCore.cmake

+4 −6
Original line number Diff line number Diff line
@@ -331,10 +331,9 @@ macro(build_arrow) 
                        CMAKE_ARGS

                        ${ARROW_CMAKE_ARGS}

                        BUILD_COMMAND

                        ${MAKE}

                        ${MAKE_BUILD_ARGS}

                        ""

                        INSTALL_COMMAND

                        ${MAKE} install

                        ${MAKE} ${MAKE_BUILD_ARGS} install

                        BUILD_BYPRODUCTS

                        "${ARROW_STATIC_LIB}"

                        )
@@ -365,10 +364,9 @@ macro(build_arrow) 
                CMAKE_ARGS

                ${ARROW_CMAKE_ARGS}

                BUILD_COMMAND

                ${MAKE}

                ${MAKE_BUILD_ARGS}

                ""

                INSTALL_COMMAND

                ${MAKE} install

                ${MAKE} ${MAKE_BUILD_ARGS} install

                BUILD_BYPRODUCTS

                "${ARROW_STATIC_LIB}"

                )