milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add exception handle when search fail

pull/609/head
yudong.cai 2019-11-29 14:13:56 +08:00
parent 8e4c5833fc
commit 93f2ce45f4
2 changed files with 10 additions and 2 deletions
core/src
index/knowhere/knowhere/index/vector_index
scheduler/task

4
core/src/index/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp
View File

@ -133,9 +133,11 @@ GPUIVF::search_impl(int64_t n, const float* data, int64_t k, float* distances, i
device_index->nprobe = search_cfg->nprobe; device_index->nprobe = search_cfg->nprobe;
// assert(device_index->getNumProbes() == search_cfg->nprobe); // assert(device_index->getNumProbes() == search_cfg->nprobe);
{ try {
ResScope rs(res_, gpu_id_); ResScope rs(res_, gpu_id_);
device_index->search(n, (float*)data, k, distances, labels); device_index->search(n, (float*)data, k, distances, labels);
} catch (faiss::FaissException& e) {
KNOWHERE_THROW_MSG(e.what());
} }
} else { } else {
KNOWHERE_THROW_MSG("Not a GpuIndexIVF type."); KNOWHERE_THROW_MSG("Not a GpuIndexIVF type.");

8
core/src/scheduler/task/SearchTask.cpp
View File

@ -212,7 +212,13 @@ XSearchTask::Execute() {
ResMgrInst::GetInstance()->GetResource(path().Last())->type() == ResourceType::CPU) { ResMgrInst::GetInstance()->GetResource(path().Last())->type() == ResourceType::CPU) {
hybrid = true; hybrid = true;
} }
index_engine_->Search(nq, vectors, topk, nprobe, output_distance.data(), output_ids.data(), hybrid); Status s =
index_engine_->Search(nq, vectors, topk, nprobe, output_distance.data(), output_ids.data(), hybrid);
if (!s.ok()) {
search_job->GetStatus() = s;
search_job->SearchDone(index_id_);
return;
}
double span = rc.RecordSection(hdr + ", do search"); double span = rc.RecordSection(hdr + ", do search");
// search_job->AccumSearchCost(span); // search_job->AccumSearchCost(span);