From 7d1c8d9f458719693a09c3ef32a1951176f265a8 Mon Sep 17 00:00:00 2001 From: Lutkin Wang Date: Thu, 12 Mar 2020 09:24:48 +0800 Subject: [PATCH 1/7] Update README.md Signed-off-by: Lutkin Wang --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e877e1e3f9..fa11aac760 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Milvus is an open source vector similarity search engine. Built with heterogeneo For more detailed introduction of Milvus and its architecture, see [Milvus overview](https://www.milvus.io/docs/about_milvus/overview.md). -Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://www.milvus.io/docs/master/releases/release_notes.md). +Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://www.milvus.io/docs/releases/release_notes.md). ## Roadmap From 8534497100d01a5677aab0c948b3cc8ffdebc6cf Mon Sep 17 00:00:00 2001 From: Lutkin Wang Date: Thu, 12 Mar 2020 09:25:03 +0800 Subject: [PATCH 2/7] Update README_CN.md Signed-off-by: Lutkin Wang --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index d40afc7800..6c27895526 100644 --- a/README_CN.md +++ b/README_CN.md @@ -31,7 +31,7 @@ Milvus 是一款开源的特征向量相似性搜索引擎。基于异构众核 若要了解 Milvus 详细介绍和整体架构，请访问 [Milvus 简介](https://www.milvus.io/cn/docs/about_milvus/overview.md)。 -通过 [版本发布说明](https://www.milvus.io/cn/docs/master/releases/release_notes.md) 获取最新版本的功能和更新。 +通过 [版本发布说明](https://www.milvus.io/cn/docs/releases/release_notes.md) 获取最新版本的功能和更新。 ## 路线图 From 6f0afa7c40bbf832cf1029d7b00af1306d983977 Mon Sep 17 00:00:00 2001 From: Lutkin Wang Date: Thu, 12 Mar 2020 09:25:52 +0800 Subject: [PATCH 3/7] Update README_JP.md Signed-off-by: Lutkin Wang --- README_JP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_JP.md b/README_JP.md index 2189e96098..b8da164cfc 100644 --- a/README_JP.md +++ b/README_JP.md @@ -31,7 +31,7 @@ Milvusは特徴ベクトルにむかうオーペンソース高性能類似性 [基本紹介](https://www.milvus.io/docs/about_milvus/overview.md)を参考して詳しい情報を手に入れます。 -Milvus [リリースノート](https://www.milvus.io/docs/master/releases/release_notes.md)を読んで最新バージョンや更新情報を手に入れます。 +Milvus [リリースノート](https://www.milvus.io/docs/releases/release_notes.md)を読んで最新バージョンや更新情報を手に入れます。 # ロードマップ From c24e2a0111d4e3ae2f0ec231c04b47ae882198ee Mon Sep 17 00:00:00 2001 From: Lutkin Wang Date: Thu, 12 Mar 2020 09:34:25 +0800 Subject: [PATCH 4/7] Update README.md Signed-off-by: Lutkin Wang --- core/src/server/web_impl/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/server/web_impl/README.md b/core/src/server/web_impl/README.md index 3abe5a462c..ec613d5a2b 100644 --- a/core/src/server/web_impl/README.md +++ b/core/src/server/web_impl/README.md @@ -680,7 +680,7 @@ Updates the index type and nlist of a collection. | Parameter | Description | Required? | | ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | -| `index_type` | The type of indexing method to query the collection. Please refer to [Index Types](https://www.milvus.io/docs/reference/index.md) for detailed introduction of supported indexes. The default is "FLAT". | No | +| `index_type` | The type of indexing method to query the collection. Please refer to [Milvus Indexes](https://www.milvus.io/docs/guides/index.md) for detailed introduction of supported indexes. The default is "FLAT". | No | | `params` | The extra params of indexing method to query the collection. Please refer to [Index and search parameters](#Index-and-search-parameters) for detailed introduction of supported indexes. | No | ##### Query Parameters @@ -1543,7 +1543,7 @@ For each index type, the RESTful API has specific index parameters and search pa -For detailed information about the parameters above, refer to [Index Types](https://milvus.io/docs/v0.7.0/reference/index.md) +For detailed information about the parameters above, refer to [Milvus Indexes](https://milvus.io/docs/guides/index.md) ## Error Codes From 04f00bbe91cdc400279bd2aff18501a847636289 Mon Sep 17 00:00:00 2001 From: Zhiru Zhu Date: Thu, 12 Mar 2020 16:43:18 +0800 Subject: [PATCH 5/7] update Signed-off-by: Zhiru Zhu --- core/src/db/engine/ExecutionEngineImpl.cpp | 9 ++++++++- core/unittest/db/utils.cpp | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp index 49f3c73b25..9352a34382 100644 --- a/core/src/db/engine/ExecutionEngineImpl.cpp +++ b/core/src/db/engine/ExecutionEngineImpl.cpp @@ -738,15 +738,22 @@ ExecutionEngineImpl::BuildIndex(const std::string& location, EngineType engine_t auto status = Status::OK(); std::vector uids; + faiss::ConcurrentBitsetPtr blacklist; if (from_index) { status = to_index->BuildAll(Count(), from_index->GetRawVectors(), from_index->GetRawIds(), conf); uids = from_index->GetUids(); + from_index->GetBlacklist(blacklist); } else if (bin_from_index) { status = to_index->BuildAll(Count(), bin_from_index->GetRawVectors(), bin_from_index->GetRawIds(), conf); uids = bin_from_index->GetUids(); + bin_from_index->GetBlacklist(blacklist); } to_index->SetUids(uids); - ENGINE_LOG_DEBUG << "set uids " << to_index->GetUids().size() << " for " << location; + ENGINE_LOG_DEBUG << "Set " << to_index->GetUids().size() << "uids for " << location; + if (blacklist != nullptr) { + to_index->SetBlacklist(blacklist); + ENGINE_LOG_DEBUG << "Set blacklist for index " << location; + } if (!status.ok()) { throw Exception(DB_ERROR, status.message()); diff --git a/core/unittest/db/utils.cpp b/core/unittest/db/utils.cpp index 77fe031d26..3d9863f159 100644 --- a/core/unittest/db/utils.cpp +++ b/core/unittest/db/utils.cpp @@ -65,7 +65,7 @@ static const char *CONFIG_STR = " cpu_cache_capacity: 4 # GB, CPU memory used for cache\n" " cpu_cache_threshold: 0.85 # percentage of data kept when cache cleanup triggered\n" " insert_buffer_size: 4 # GB, maximum insert buffer size allowed\n" - " cache_insert_data: false # whether load inserted data into cache\n" + " cache_insert_data: true # whether load inserted data into cache\n" "\n" "engine_config:\n" " use_blas_threshold: 20\n" @@ -179,6 +179,7 @@ DBTest::SetUp() { milvus::scheduler::JobMgrInst::GetInstance()->Start(); auto options = GetOptions(); + options.insert_cache_immediately_ = true; db_ = milvus::engine::DBFactory::Build(options); std::string config_path(options.meta_.path_ + CONFIG_FILE); From 7ac4e95e86067d02ce3bb8eeb23af88dad532538 Mon Sep 17 00:00:00 2001 From: Zhiru Zhu Date: Thu, 12 Mar 2020 16:44:43 +0800 Subject: [PATCH 6/7] update Signed-off-by: Zhiru Zhu --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb778c2c8a..6c881bc7d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ Please mark all change in change log and use the issue from GitHub - \#1598 Server down during mixed operations - \#1601 External link bug in HTTP doc - \#1609 Refine Compact function +- \#1635 Vectors can be returned by searching after vectors deleted if `cache_insert_data` set true ## Feature - \#216 Add CLI to get server info From 7ec0444dc0238da1aae396e7e1401d4551772675 Mon Sep 17 00:00:00 2001 From: Zhiru Zhu Date: Thu, 12 Mar 2020 16:57:52 +0800 Subject: [PATCH 7/7] update Signed-off-by: Zhiru Zhu --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c881bc7d0..9938505788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ Please mark all change in change log and use the issue from GitHub -# Milvus 0.7.0 (TBD) +# Milvus 0.7.1 (TBD) + +## Bug +- \#1635 Vectors can be returned by searching after vectors deleted if `cache_insert_data` set true + +# Milvus 0.7.0 (2020-03-11) ## Bug - \#715 Milvus crash when searching and building index simultaneously using SQ8H @@ -60,7 +65,6 @@ Please mark all change in change log and use the issue from GitHub - \#1598 Server down during mixed operations - \#1601 External link bug in HTTP doc - \#1609 Refine Compact function -- \#1635 Vectors can be returned by searching after vectors deleted if `cache_insert_data` set true ## Feature - \#216 Add CLI to get server info