Commit 3f670f34 authored Oct 14, 2019 by peng.xu

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

fix build error

See merge request megasearch/milvus!710

Former-commit-id: e9806bb903d807550ac3170c03fc8bd8975819ef

parents 56b5e006 41aecb1c

core/src/db/meta/MetaTypes.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -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,

core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -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

core/src/server/grpc_impl/GrpcRequestTask.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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");
		}
		}