admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

#2642 Create index failed caused by server crashed. (#2701)

Browse Source 
* #2642 Create index failed caused by server crashed.

Signed-off-by: yhmo <yihua.mo@zilliz.com>

* changelog

Signed-off-by: yhmo <yihua.mo@zilliz.com>

* changelog

Signed-off-by: yhmo <yihua.mo@zilliz.com>

* typo

Signed-off-by: yhmo <yihua.mo@zilliz.com>
This commit is contained in:
groot 2020-07-02 09:37:15 +08:00 committed by GitHub
parent 36db2f4da4
commit 714b777d05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 89 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -6,13 +6,14 @@ Please mark all change in change log and use the issue from GitHub
## Bug
- \#2487 Enlarge timeout value for creating collection
- \#2585 IVF_PQ on GPU with using metric_type IP
- \#2557 Fix random crash of INSERT_DUPLICATE_ID case
- \#2578 Result count doesn't match target vectors count
- \#2557 fix random crash of INSERT_DUPLICATE_ID case
- \#2598 fix Milvus docker image report illegal instruction
- \#2585 IVF_PQ on GPU with using metric_type IP
- \#2598 Fix Milvus docker image report illegal instruction
- \#2617 Fix HNSW and RNSG index files size
- \#2637 Suit the range of HNSW parameters
- \#2649 search parameter of annoy has conflict with document
- \#2642 Create index failed and server crashed
- \#2649 Search parameter of annoy has conflict with document
## Feature

16
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIDMAP.cpp
View File

@ -112,6 +112,22 @@ BinaryIDMAP::QueryById(const DatasetPtr& dataset_ptr, const Config& config) {
}
#endif
int64_t
BinaryIDMAP::Count() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->ntotal;
}
int64_t
BinaryIDMAP::Dim() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->d;
}
void
BinaryIDMAP::Add(const DatasetPtr& dataset_ptr, const Config& config) {
if (!index_) {

8
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIDMAP.h
View File

@ -56,14 +56,10 @@ class BinaryIDMAP : public VecIndex, public FaissBaseBinaryIndex {
#endif
int64_t
Count() override {
return index_->ntotal;
}
Count() override;
int64_t
Dim() override {
return index_->d;
}
Dim() override;
int64_t
IndexSize() override {

16
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIVF.cpp
View File

@ -129,6 +129,22 @@ BinaryIVF::QueryById(const DatasetPtr& dataset_ptr, const Config& config) {
}
#endif
int64_t
BinaryIVF::Count() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->ntotal;
}
int64_t
BinaryIVF::Dim() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->d;
}
void
BinaryIVF::Train(const DatasetPtr& dataset_ptr, const Config& config) {
GETTENSORWITHIDS(dataset_ptr)

8
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIVF.h
View File

@ -68,14 +68,10 @@ class BinaryIVF : public VecIndex, public FaissBaseBinaryIndex {
#endif
int64_t
Count() override {
return index_->ntotal;
}
Count() override;
int64_t
Dim() override {
return index_->d;
}
Dim() override;
#if 0
DatasetPtr

16
core/src/index/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
View File

@ -142,6 +142,22 @@ IDMAP::QueryById(const DatasetPtr& dataset_ptr, const Config& config) {
}
#endif
int64_t
IDMAP::Count() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->ntotal;
}
int64_t
IDMAP::Dim() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->d;
}
VecIndexPtr
IDMAP::CopyCpuToGpu(const int64_t device_id, const Config& config) {
#ifdef MILVUS_GPU_VERSION

8
core/src/index/knowhere/knowhere/index/vector_index/IndexIDMAP.h
View File

@ -54,14 +54,10 @@ class IDMAP : public VecIndex, public FaissBaseIndex {
#endif
int64_t
Count() override {
return index_->ntotal;
}
Count() override;
int64_t
Dim() override {
return index_->d;
}
Dim() override;
int64_t
IndexSize() override {

16
core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.cpp
View File

@ -217,6 +217,22 @@ IVF::GetVectorById(const DatasetPtr& dataset_ptr, const Config& config) {
}
#endif
int64_t
IVF::Count() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->ntotal;
}
int64_t
IVF::Dim() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->d;
}
void
IVF::Seal() {
if (!index_ || !index_->is_trained) {

8
core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h
View File

@ -59,14 +59,10 @@ class IVF : public VecIndex, public FaissBaseIndex {
#endif
int64_t
Count() override {
return index_->ntotal;
}
Count() override;
int64_t
Dim() override {
return index_->d;
}
Dim() override;
#if 0
DatasetPtr

6
core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
View File

@ -149,11 +149,17 @@ NSG::Train(const DatasetPtr& dataset_ptr, const Config& config) {
int64_t
NSG::Count() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->ntotal;
}
int64_t
NSG::Dim() {
if (!index_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_->dimension;
}

6
core/src/index/knowhere/knowhere/index/vector_index/IndexSPTAG.cpp
View File

@ -200,11 +200,17 @@ CPUSPTAGRNG::Query(const DatasetPtr& dataset_ptr, const Config& config) {
int64_t
CPUSPTAGRNG::Count() {
if (!index_ptr_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_ptr_->GetNumSamples();
}
int64_t
CPUSPTAGRNG::Dim() {
if (!index_ptr_) {
KNOWHERE_THROW_MSG("index not initialize");
}
return index_ptr_->GetFeatureDim();
}