Commit 6a9af2f7 authored by Heisenberg's avatar Heisenberg
Browse files

Merge branch 'branch-0.5.0' into fix_thermal_bug 


Former-commit-id: a1a2ed24cb21153ee748dd88a40ab03893a5b9e3
parents 96b45251 547c5fa9

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-609 - Update task construct function

- MS-611 - Add resources validity check in ResourceMgr

- MS-619 - Add optimizer class in scheduler

- MS-614 - Preload table at startup



## New Feature

cpp/conf/server_config.template

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ db_config: 
                                    # sum of insert_buffer_size and cpu_cache_capacity cannot exceed total memory

  build_index_gpu: 0                # gpu id used for building index



  preload_table:                    # preload data at startup, '*' means load all tables, empty value means no preload

                                    # you can specify preload tables like this: table1,table2,table3



metric_config:

  enable_monitor: false             # enable monitoring or not

  collector: prometheus             # prometheus

cpp/coverage.sh

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "src/metrics/MetricBase.h"\

    "src/server/Server.cpp"\

    "src/server/DBWrapper.cpp"\

    "src/server/grpc_impl/GrpcMilvusServer.cpp"\

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

    "src/utils/easylogging++.h"\

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

cpp/src/core/knowhere/knowhere/common/Buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct BufferDeleter { 
        free((void*)buffer->data());

    }

};

}

}  // namespace internal



inline BufferPtr

MakeBufferSmart(uint8_t* data, const int64_t size) {

cpp/src/core/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
// specific language governing permissions and limitations

// under the License.



#include <faiss/IndexIVF.h>

#include <faiss/index_io.h>

#include <utility>



#include "knowhere/common/Exception.h"

#include "knowhere/index/vector_index/FaissBaseIndex.h"

#include "knowhere/index/vector_index/IndexIVF.h"

#include "knowhere/index/vector_index/helpers/FaissIO.h"



namespace knowhere {