From fc74f013a06f11e535f8dd613fd69320fb8516d4 Mon Sep 17 00:00:00 2001 From: starlord Date: Thu, 4 Jul 2019 16:58:40 +0800 Subject: [PATCH] add uiittest for merge result functions Former-commit-id: 810194f590afbd4b4625840875e1447b464011b0 --- cpp/CHANGELOG.md | 3 --- cpp/src/db/scheduler/task/SearchTask.cpp | 2 +- cpp/unittest/db/search_test.cpp | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 8d78dfba99..40d5ef2cd8 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -14,9 +14,6 @@ Please mark all change in change log and use the ticket from JIRA. ## Improvement - MS-156 - Add unittest for merge result functions - -- MS-152 - Delete assert in MySQLMetaImpl and change MySQLConnectionPool impl - - MS-152 - Delete assert in MySQLMetaImpl and change MySQLConnectionPool impl ## New Feature diff --git a/cpp/src/db/scheduler/task/SearchTask.cpp b/cpp/src/db/scheduler/task/SearchTask.cpp index 8bea768a23..708bcc8708 100644 --- a/cpp/src/db/scheduler/task/SearchTask.cpp +++ b/cpp/src/db/scheduler/task/SearchTask.cpp @@ -67,7 +67,7 @@ std::shared_ptr SearchTask::Execute() { //step 3: cluster result SearchContext::ResultSet result_set; auto spec_k = index_engine_->Count() < context->topk() ? index_engine_->Count() : context->topk(); - ClusterResult(output_ids, output_distence, context->nq(), spec_k, result_set); + SearchTask::ClusterResult(output_ids, output_distence, context->nq(), spec_k, result_set); rc.Record("cluster result"); //step 4: pick up topk result diff --git a/cpp/unittest/db/search_test.cpp b/cpp/unittest/db/search_test.cpp index ce99ea78f7..60d210956f 100644 --- a/cpp/unittest/db/search_test.cpp +++ b/cpp/unittest/db/search_test.cpp @@ -4,9 +4,7 @@ // Proprietary and confidential. //////////////////////////////////////////////////////////////////////////////// #include "db/scheduler/task/SearchTask.h" - #include - #include #include