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

Merge remote-tracking branch 'upstream/0.5.0' into 0.5.0 

Former-commit-id: c0093fc80e2c855f1965286e0b79af1b2d3b3ebe
pull/191/head
JinHai-CN 2019-10-21 19:32:25 +08:00
parent 72883b292b 6a124bf897
commit 4a25e6186e
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/scheduler/task/SearchTask.h
View File

@ -44,8 +44,8 @@ class XSearchTask : public Task {
// static void
// MergeTopkArray(std::vector<int64_t>& tar_ids, std::vector<float>& tar_distance, uint64_t& tar_input_k,
// const std::vector<int64_t>& src_ids, const std::vector<float>& src_distance, uint64_t src_input_k,
// uint64_t nq, uint64_t topk, bool ascending);
// const std::vector<int64_t>& src_ids, const std::vector<float>& src_distance, uint64_t
// src_input_k, uint64_t nq, uint64_t topk, bool ascending);
public:
TableFileSchemaPtr file_;

3
core/unittest/db/test_search.cpp
View File

@ -126,7 +126,8 @@ CheckTopkResult(const std::vector<int64_t>& input_ids_1,
} // namespace
void MergeTopkToResultSetTest(uint64_t topk_1, uint64_t topk_2, uint64_t nq, uint64_t topk, bool ascending) {
void
MergeTopkToResultSetTest(uint64_t topk_1, uint64_t topk_2, uint64_t nq, uint64_t topk, bool ascending) {
std::vector<int64_t> ids1, ids2;
std::vector<float> dist1, dist2;
ms::ResultSet result;