milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #347 from yhmo/0.6.0 

#340 Test cases run failed on 0.6.0
pull/324/head^2
Jin Hai 2019-11-15 18:55:03 +08:00 committed by GitHub
parent 49ec7e1a7e d93182a209
commit 140a7a59a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#246 - Exclude src/external folder from code coverage for jenkin ci - \#246 - Exclude src/external folder from code coverage for jenkin ci
- \#248 - Reside src/external in thirdparty - \#248 - Reside src/external in thirdparty
- \#316 - Some files not merged after vectors added - \#316 - Some files not merged after vectors added
- \#340 - Test cases run failed on 0.6.0
## Feature ## Feature
- \#12 - Pure CPU version for Milvus - \#12 - Pure CPU version for Milvus

20
core/src/db/DBImpl.cpp
View File

@ -179,9 +179,10 @@ DBImpl::PreloadTable(const std::string& table_id) {
} }
// get all table files from parent table // get all table files from parent table
meta::DatesT dates;
std::vector<size_t> ids; std::vector<size_t> ids;
meta::TableFilesSchema files_array; meta::TableFilesSchema files_array;
auto status = GetFilesToSearch(table_id, ids, files_array); auto status = GetFilesToSearch(table_id, ids, dates, files_array);
if (!status.ok()) { if (!status.ok()) {
return status; return status;
} }
@ -190,7 +191,7 @@ DBImpl::PreloadTable(const std::string& table_id) {
std::vector<meta::TableSchema> partiton_array; std::vector<meta::TableSchema> partiton_array;
status = meta_ptr_->ShowPartitions(table_id, partiton_array); status = meta_ptr_->ShowPartitions(table_id, partiton_array);
for (auto& schema : partiton_array) { for (auto& schema : partiton_array) {
status = GetFilesToSearch(schema.table_id_, ids, files_array); status = GetFilesToSearch(schema.table_id_, ids, dates, files_array);
} }
int64_t size = 0; int64_t size = 0;
@ -304,6 +305,10 @@ DBImpl::InsertVectors(const std::string& table_id, const std::string& partition_
if (!partition_tag.empty()) { if (!partition_tag.empty()) {
std::string partition_name; std::string partition_name;
status = meta_ptr_->GetPartitionName(table_id, partition_tag, target_table_name); status = meta_ptr_->GetPartitionName(table_id, partition_tag, target_table_name);
if (!status.ok()) {
ENGINE_LOG_ERROR << status.message();
return status;
}
} }
// insert vectors into target table // insert vectors into target table
@ -400,7 +405,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti
if (partition_tags.empty()) { if (partition_tags.empty()) {
// no partition tag specified, means search in whole table // no partition tag specified, means search in whole table
// get all table files from parent table // get all table files from parent table
status = GetFilesToSearch(table_id, ids, files_array); status = GetFilesToSearch(table_id, ids, dates, files_array);
if (!status.ok()) { if (!status.ok()) {
return status; return status;
} }
@ -408,7 +413,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti
std::vector<meta::TableSchema> partiton_array; std::vector<meta::TableSchema> partiton_array;
status = meta_ptr_->ShowPartitions(table_id, partiton_array); status = meta_ptr_->ShowPartitions(table_id, partiton_array);
for (auto& schema : partiton_array) { for (auto& schema : partiton_array) {
status = GetFilesToSearch(schema.table_id_, ids, files_array); status = GetFilesToSearch(schema.table_id_, ids, dates, files_array);
} }
} else { } else {
// get files from specified partitions // get files from specified partitions
@ -416,7 +421,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti
GetPartitionsByTags(table_id, partition_tags, partition_name_array); GetPartitionsByTags(table_id, partition_tags, partition_name_array);
for (auto& partition_name : partition_name_array) { for (auto& partition_name : partition_name_array) {
status = GetFilesToSearch(partition_name, ids, files_array); status = GetFilesToSearch(partition_name, ids, dates, files_array);
} }
} }
@ -446,7 +451,7 @@ DBImpl::QueryByFileID(const std::string& table_id, const std::vector<std::string
} }
meta::TableFilesSchema files_array; meta::TableFilesSchema files_array;
auto status = GetFilesToSearch(table_id, ids, files_array); auto status = GetFilesToSearch(table_id, ids, dates, files_array);
if (!status.ok()) { if (!status.ok()) {
return status; return status;
} }
@ -829,9 +834,8 @@ DBImpl::BackgroundBuildIndex() {
} }
Status Status
DBImpl::GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, DBImpl::GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, const meta::DatesT& dates,
meta::TableFilesSchema& files) { meta::TableFilesSchema& files) {
meta::DatesT dates;
meta::DatePartionedTableFilesSchema date_files; meta::DatePartionedTableFilesSchema date_files;
auto status = meta_ptr_->FilesToSearch(table_id, file_ids, dates, date_files); auto status = meta_ptr_->FilesToSearch(table_id, file_ids, dates, date_files);
if (!status.ok()) { if (!status.ok()) {

3
core/src/db/DBImpl.h
View File

@ -153,7 +153,8 @@ class DBImpl : public DB {
MemSerialize(); MemSerialize();
Status Status
GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, meta::TableFilesSchema& files); GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, const meta::DatesT& dates,
meta::TableFilesSchema& files);
Status Status
GetPartitionsByTags(const std::string& table_id, const std::vector<std::string>& partition_tags, GetPartitionsByTags(const std::string& table_id, const std::vector<std::string>& partition_tags,