Commit 4a25e618 authored by JinHai-CN's avatar JinHai-CN
Browse files

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


Former-commit-id: c0093fc80e2c855f1965286e0b79af1b2d3b3ebe
parents 72883b29 6a124bf8

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.