Commit 45d5c9b2 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #69 from JinHai-CN/0.5.0 

Merge from local

Former-commit-id: b5f9ffb6803af753195912340b14c75821484816
parents f17195c6 bc33b86e

README.md

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen)

![Language](https://img.shields.io/badge/language-C%2B%2B-blue)

[![codebeat badge](https://codebeat.co/badges/e030a4f6-b126-4475-a938-4723d54ec3a7?style=plastic)](https://codebeat.co/projects/github-com-jinhai-cn-milvus-master)



- [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk)

- [Twitter](https://twitter.com/milvusio)

core/src/scheduler/task/SearchTask.h

+4 −4
Original line number Diff line number Diff line
@@ -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_;

core/unittest/db/test_search.cpp

+11 −10
Original line number Diff line number Diff line
@@ -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;

core/src/scheduler/task/SearchTask.cpp

+2 −2

File changed.

Contains only whitespace changes.