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

Merge pull request #610 from yhmo/0.6.0 

#606  No log generated during building index with CPU
parents 7d0a3ae0 ce10d1c8

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error

- \#599 - Build index log is incorrect

- \#602 - Optimizer specify wrong gpu_id

- \#606 - No log generated during building index with CPU



## Feature

- \#12 - Pure CPU version for Milvus

core/src/db/DBImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -842,13 +842,13 @@ DBImpl::BackgroundBuildIndex() { 


    if (!to_index_files.empty()) {

        // step 2: put build index task to scheduler

        std::map<scheduler::BuildIndexJobPtr, scheduler::TableFileSchemaPtr> job2file_map;

        std::vector<std::pair<scheduler::BuildIndexJobPtr, scheduler::TableFileSchemaPtr>> job2file_map;

        for (auto& file : to_index_files) {

            scheduler::BuildIndexJobPtr job = std::make_shared<scheduler::BuildIndexJob>(meta_ptr_, options_);

            scheduler::TableFileSchemaPtr file_ptr = std::make_shared<meta::TableFileSchema>(file);

            job->AddToIndexFiles(file_ptr);

            scheduler::JobMgrInst::GetInstance()->Put(job);

            job2file_map.insert(std::make_pair(job, file_ptr));

            job2file_map.push_back(std::make_pair(job, file_ptr));

        }



        for (auto iter = job2file_map.begin(); iter != job2file_map.end(); ++iter) {