Merge branch 'branch-0.4.0' into 'branch-0.4.0'

fix searchinfiles return status bug

See merge request megasearch/milvus!559

Former-commit-id: 8ed2f5d9eefdd0982de2d2aa5e10880552b25269
pull/191/head
peng.xu 2019-09-12 12:03:25 +08:00
commit 5ae1a6e7f0
1 changed files with 3 additions and 6 deletions

View File

@ -97,12 +97,9 @@ GrpcRequestHandler::SearchInFiles(::grpc::ServerContext *context,
BaseTaskPtr task_ptr = SearchTask::Create(request_mutable->mutable_search_param(), file_id_array, response);
::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
if (grpc_status.error_code() != SERVER_SUCCESS) {
::grpc::Status status(::grpc::INVALID_ARGUMENT, grpc_status.reason());
return status;
} else {
return ::grpc::Status::OK;
}
response->mutable_status()->set_error_code(grpc_status.error_code());
response->mutable_status()->set_reason(grpc_status.reason());
return ::grpc::Status::OK;
}
::grpc::Status