Unverified Commit be8a3e2a authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #655 from yhmo/0.6.0 

#654 Random crash when frequently insert vector one by one
parents 60895e5e 7a27e9d4

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#606 - No log generated during building index with CPU

- \#631 - FAISS isn't compiled with O3 option

- \#649 - Typo "partiton" should be "partition"

- \#654 - Random crash when frequently insert vector one by one



## Feature

- \#12 - Pure CPU version for Milvus

core/src/db/DBImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ constexpr uint64_t METRIC_ACTION_INTERVAL = 1; 
constexpr uint64_t COMPACT_ACTION_INTERVAL = 1;

constexpr uint64_t INDEX_ACTION_INTERVAL = 1;



static const Status SHUTDOWN_ERROR = Status(DB_ERROR, "Milsvus server is shutdown!");

static const Status SHUTDOWN_ERROR = Status(DB_ERROR, "Milvus server is shutdown!");



void

TraverseFiles(const meta::DatePartionedTableFilesSchema& date_files, meta::TableFilesSchema& files_array) {

core/src/db/insert/MemManagerImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ MemManagerImpl::EraseMemVector(const std::string& table_id) { 
size_t

MemManagerImpl::GetCurrentMutableMem() {

    size_t total_mem = 0;

    std::unique_lock<std::mutex> lock(mutex_);

    for (auto& kv : mem_id_map_) {

        auto memTable = kv.second;

        total_mem += memTable->GetCurrentMem();
@@ -126,6 +127,7 @@ MemManagerImpl::GetCurrentMutableMem() { 
size_t

MemManagerImpl::GetCurrentImmutableMem() {

    size_t total_mem = 0;

    std::unique_lock<std::mutex> lock(serialization_mtx_);

    for (auto& mem_table : immu_mem_list_) {

        total_mem += mem_table->GetCurrentMem();

    }

core/src/server/grpc_impl/request/CmdRequest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CmdRequest::Create(const std::string& cmd, std::string& result) { 
Status

CmdRequest::OnExecute() {

    std::string hdr = "CmdRequest(cmd=" + cmd_ + ")";

    TimeRecorder rc(hdr);

    TimeRecorderAuto rc(hdr);



    if (cmd_ == "version") {

        result_ = MILVUS_VERSION;

core/src/server/grpc_impl/request/CountTableRequest.cpp

+1 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Status 
CountTableRequest::OnExecute() {

    try {

        std::string hdr = "CountTableRequest(table=" + table_name_ + ")";

        TimeRecorder rc(hdr);

        TimeRecorderAuto rc(hdr);



        // step 1: check arguments

        auto status = ValidationUtil::ValidateTableName(table_name_);
@@ -60,8 +60,6 @@ CountTableRequest::OnExecute() { 
        }



        row_count_ = static_cast<int64_t>(row_count);



        rc.ElapseFromBegin("total cost");

    } catch (std::exception& ex) {

        return Status(SERVER_UNEXPECTED_ERROR, ex.what());

    }