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

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

fix build error

See merge request megasearch/milvus!710

Former-commit-id: c82064b29a0d7576322b876e0d72ef412cee4370
pull/191/head
peng.xu 2019-10-14 15:38:00 +08:00
parent 5b93d1e903 3b73e99b28
commit e037b64d65
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/db/meta/MetaTypes.h
View File

@ -41,11 +41,6 @@ using DateT = int;
const DateT EmptyDate = -1;
using DatesT = std::vector<DateT>;
struct DateRange {
DateT start_date_ = 0x1 << 32;
DateT end_date_ = 0;
};
struct TableSchema {
typedef enum {
NORMAL,

8
core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp
View File

@ -256,8 +256,14 @@ void
IVFSQHybrid::UnsetQuantizer() {
}
void
VectorIndexPtr
IVFSQHybrid::LoadData(const knowhere::QuantizerPtr& q, const Config& conf) {
return nullptr;
}
std::pair<VectorIndexPtr, QuantizerPtr>
IVFSQHybrid::CopyCpuToGpuWithQuantizer(const int64_t& device_id, const Config& config) {
KNOWHERE_THROW_MSG("Not yet implemented");
}
IndexModelPtr

4
core/src/server/grpc_impl/GrpcRequestTask.cpp
View File

@ -423,8 +423,8 @@ InsertTask::OnExecute() {
return Status(SERVER_INVALID_ROWRECORD_ARRAY, "Row record array is empty");
}
if (!record_ids_->vector_id_array().empty()) {
if (record_ids_->vector_id_array().size() != insert_param_->row_record_array_size()) {
if (!insert_param_->row_id_array().empty()) {
if (insert_param_->row_id_array().size() != insert_param_->row_record_array_size()) {
return Status(SERVER_ILLEGAL_VECTOR_ID, "Size of vector ids is not equal to row record array size");
}
}