From 7316b356c2c88d07b28e82475f7197eb8d9e518d Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Wed, 16 Oct 2019 17:22:02 +0800 Subject: [PATCH 01/10] add twitter icon Former-commit-id: b67ce655d1a0178a468f7cb84310fc8af4f8b6d3 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d2622816b7..7fc313bfee 100644 --- a/README.md +++ b/README.md @@ -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) +![[Twitter Follow](https://img.shields.io/twitter/url?style=social)](https://twitter.com/milvusio) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvus_io) From 72dbb7f387445a185c3a036a956f54c80183703c Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Wed, 16 Oct 2019 18:51:04 +0800 Subject: [PATCH 02/10] modify Readme Former-commit-id: 1ec1f268dfbbf7cac6492f1c1645a7af864f9863 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7fc313bfee..259b0493a7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue) -![[Twitter Follow](https://img.shields.io/twitter/url?style=social)](https://twitter.com/milvusio) +[![Twitter Follow](https://img.shields.io/twitter/url?style=social)](https://twitter.com/milvusio) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvus_io) From be7b0eb19157139d9ea947a224b5901f0d2434a5 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Wed, 16 Oct 2019 18:57:45 +0800 Subject: [PATCH 03/10] modify Readme.md Former-commit-id: 9b91e6e42b6e2249d35a2922ec07d52a32e236df --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 259b0493a7..93ef7f32c6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue) -[![Twitter Follow](https://img.shields.io/twitter/url?style=social)](https://twitter.com/milvusio) +[![Twitter Follow](https://img.shields.io/twitter/follow/milvusio.svg?style=social&label=Follow)](https://twitter.com/milvusio) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvus_io) From 37c149ea4079bbb1fe9b96ee20259cf0b4a8b3cc Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Wed, 16 Oct 2019 20:17:40 +0800 Subject: [PATCH 04/10] add icons in readme file Former-commit-id: ffaa76c8345211058eb672c4295eb0ee7dbf7fef --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93ef7f32c6..c01d979b45 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue) -[![Twitter Follow](https://img.shields.io/twitter/follow/milvusio.svg?style=social&label=Follow)](https://twitter.com/milvusio) +[![@milvusio](https://img.shields.io/twitter/follow/milvusio.svg?style=social&label=Follow)](https://twitter.com/milvusio) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvus_io) From e95a4f8fda454267b48ffdcaa540d02436c0ce59 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Thu, 17 Oct 2019 09:49:14 +0800 Subject: [PATCH 05/10] add codebeat icon Former-commit-id: f2a0052261f0db6e8cc7fd00da7011621429e484 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3f3492d920..b40d36b798 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue) [![@milvusio](https://img.shields.io/twitter/follow/milvusio.svg?style=social&label=Follow)](https://twitter.com/milvusio) +[![codebeat badge](https://codebeat.co/badges/57be869e-fac6-482d-82bf-68018369bcd6)](https://codebeat.co/projects/github-com-bosszou-milvus-master) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvusio) From d190ea2eefb15a043f9485285121ccbacfbf5c70 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Thu, 17 Oct 2019 20:07:12 +0800 Subject: [PATCH 06/10] remove some icons Former-commit-id: 25f159c1b22122e8d0c29141b92cb93c8ca77e56 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index b40d36b798..08760798e2 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue) -[![@milvusio](https://img.shields.io/twitter/follow/milvusio.svg?style=social&label=Follow)](https://twitter.com/milvusio) -[![codebeat badge](https://codebeat.co/badges/57be869e-fac6-482d-82bf-68018369bcd6)](https://codebeat.co/projects/github-com-bosszou-milvus-master) - [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk) - [Twitter](https://twitter.com/milvusio) From 1b9227ec918272e409cd693b221d66bcc37e0054 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Thu, 17 Oct 2019 20:40:48 +0800 Subject: [PATCH 07/10] add codebeat icon Former-commit-id: a64ef77af78e05e5f7825a6c8162ff1af799929a --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 08760798e2..72d035b80e 100644 --- a/README.md +++ b/README.md @@ -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) From cf184890dc089bbb2d9cd4d7aeeac5d689428f07 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Thu, 17 Oct 2019 20:50:20 +0800 Subject: [PATCH 08/10] add codebeat icon into readme.md Former-commit-id: a5af11e6422e1883018c8a3817f90d30f291dd83 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eda2e7fda2..4143b678ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-626 - Refactor DataObj to support cache any type data - MS-648 - Improve unittest - MS-655 - Upgrade SPTAG +- MS-666 - Add codebeat icon into README.md ## New Feature - MS-614 - Preload table at startup From e22a11d556e78876328c6bc330dfecadbef51495 Mon Sep 17 00:00:00 2001 From: "yinghao.zou" Date: Fri, 18 Oct 2019 10:51:02 +0800 Subject: [PATCH 09/10] remove codebeat tip from readme.md & close #37 Former-commit-id: 095ad1ec3e19ff96e9d666b09ede50c5e1a3ce0d --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4143b678ba..eda2e7fda2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,6 @@ Please mark all change in change log and use the ticket from JIRA. - MS-626 - Refactor DataObj to support cache any type data - MS-648 - Improve unittest - MS-655 - Upgrade SPTAG -- MS-666 - Add codebeat icon into README.md ## New Feature - MS-614 - Preload table at startup From bbc2c90741c8a8c38ccf599f59d77720cf88b51a Mon Sep 17 00:00:00 2001 From: starlord Date: Mon, 21 Oct 2019 19:30:54 +0800 Subject: [PATCH 10/10] format code Former-commit-id: 1e15f2112b93a17958c2e663fafc79cf39dd3148 --- core/src/scheduler/task/SearchTask.cpp | 4 ++-- core/src/scheduler/task/SearchTask.h | 8 ++++---- core/unittest/db/test_search.cpp | 21 +++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/core/src/scheduler/task/SearchTask.cpp b/core/src/scheduler/task/SearchTask.cpp index 1f559ff5d0..1bf1caff76 100644 --- a/core/src/scheduler/task/SearchTask.cpp +++ b/core/src/scheduler/task/SearchTask.cpp @@ -307,8 +307,8 @@ XSearchTask::MergeTopkToResultSet(const std::vector& input_ids, const s } } -//void -//XSearchTask::MergeTopkArray(std::vector& tar_ids, std::vector& tar_distance, uint64_t& tar_input_k, +// void +// XSearchTask::MergeTopkArray(std::vector& tar_ids, std::vector& tar_distance, uint64_t& tar_input_k, // const std::vector& src_ids, const std::vector& src_distance, // uint64_t src_input_k, uint64_t nq, uint64_t topk, bool ascending) { // if (src_ids.empty() || src_distance.empty()) { diff --git a/core/src/scheduler/task/SearchTask.h b/core/src/scheduler/task/SearchTask.h index bbbf891383..bbc8b5bd8f 100644 --- a/core/src/scheduler/task/SearchTask.h +++ b/core/src/scheduler/task/SearchTask.h @@ -42,10 +42,10 @@ class XSearchTask : public Task { MergeTopkToResultSet(const std::vector& input_ids, const std::vector& input_distance, uint64_t input_k, uint64_t nq, uint64_t topk, bool ascending, scheduler::ResultSet& result); -// static void -// MergeTopkArray(std::vector& tar_ids, std::vector& tar_distance, uint64_t& tar_input_k, -// const std::vector& src_ids, const std::vector& src_distance, uint64_t src_input_k, -// uint64_t nq, uint64_t topk, bool ascending); + // static void + // MergeTopkArray(std::vector& tar_ids, std::vector& tar_distance, uint64_t& tar_input_k, + // const std::vector& src_ids, const std::vector& src_distance, uint64_t + // src_input_k, uint64_t nq, uint64_t topk, bool ascending); public: TableFileSchemaPtr file_; diff --git a/core/unittest/db/test_search.cpp b/core/unittest/db/test_search.cpp index db736923a6..b8cf08b3e2 100644 --- a/core/unittest/db/test_search.cpp +++ b/core/unittest/db/test_search.cpp @@ -46,7 +46,7 @@ BuildResult(std::vector& output_ids, output_distance[i * topk + j] = ascending ? (j + drand48()) : ((input_k - j) + drand48()); } //insert invalid items - for(uint64_t j = input_k; j < topk; j++) { + for (uint64_t j = input_k; j < topk; j++) { output_ids[i * topk + j] = -1; output_distance[i * topk + j] = -1.0; } @@ -113,7 +113,7 @@ CheckTopkResult(const std::vector& input_ids_1, uint64_t n = std::min(topk, result[i].size()); for (uint64_t j = 0; j < n; j++) { - if(result[i][j].first < 0) { + if (result[i][j].first < 0) { continue; } if (src_vec[j] != result[i][j].second) { @@ -126,7 +126,8 @@ CheckTopkResult(const std::vector& 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 ids1, ids2; std::vector dist1, dist2; ms::ResultSet result; @@ -150,12 +151,12 @@ TEST(DBSearchTest, MERGE_RESULT_SET_TEST) { MergeTopkToResultSetTest(TOP_K, TOP_K, NQ, TOP_K, false); /* test3, id1/dist1 small topk */ - MergeTopkToResultSetTest(TOP_K/2, TOP_K, NQ, TOP_K, true); - MergeTopkToResultSetTest(TOP_K/2, TOP_K, NQ, TOP_K, false); + MergeTopkToResultSetTest(TOP_K / 2, TOP_K, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K / 2, TOP_K, NQ, TOP_K, false); /* test4, id1/dist1 small topk, id2/dist2 small topk */ - MergeTopkToResultSetTest(TOP_K/2, TOP_K/3, NQ, TOP_K, true); - MergeTopkToResultSetTest(TOP_K/2, TOP_K/3, NQ, TOP_K, false); + MergeTopkToResultSetTest(TOP_K / 2, TOP_K / 3, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K / 2, TOP_K / 3, NQ, TOP_K, false); } //void MergeTopkArrayTest(uint64_t topk_1, uint64_t topk_2, uint64_t nq, uint64_t topk, bool ascending) { @@ -224,8 +225,8 @@ TEST(DBSearchTest, REDUCE_PERF_TEST) { std::vector thread_vec = {4, 8}; std::vector nq_vec = {1, 10, 100}; std::vector topk_vec = {1, 4, 16, 64}; - int32_t NQ = nq_vec[nq_vec.size()-1]; - int32_t TOPK = topk_vec[topk_vec.size()-1]; + int32_t NQ = nq_vec[nq_vec.size() - 1]; + int32_t TOPK = topk_vec[topk_vec.size() - 1]; std::vector> id_vec; std::vector> dist_vec; @@ -255,7 +256,7 @@ TEST(DBSearchTest, REDUCE_PERF_TEST) { } std::string str1 = "Method-1 " + std::to_string(max_thread_num) + " " + - std::to_string(nq) + " " + std::to_string(top_k); + std::to_string(nq) + " " + std::to_string(top_k); milvus::TimeRecorder rc1(str1); ///////////////////////////////////////////////////////////////////////////////////////