format code (5641bff9) · Commits · SUMMER2020 / students / proj-2018085

core/src/server/grpc_impl/GrpcRequestTask.cpp

+18 −10

Original line number	Diff line number	Diff line
		@@ -114,9 +114,11 @@ ConvertTimeRangeToDBDates(const std::vector<::milvus::grpc::Range>& range_array,
		return Status::OK();
		}

		std::string TableNotExistMsg(const std::string& table_name) {
		return "Table " + table_name
		+ " not exist. Use milvus.has_table to verify whether the table exists. You also can check if the table name exists.";
		std::string
		TableNotExistMsg(const std::string& table_name) {
		return "Table " + table_name +
		" not exist. Use milvus.has_table to verify whether the table exists. You also can check if the table name "
		"exists.";
		}

		} // namespace
		@@ -426,12 +428,14 @@ InsertTask::OnExecute() {
		return status;
		}
		if (insert_param_->row_record_array().empty()) {
		return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector array is empty. Make sure you have entered vector records.");
		return Status(SERVER_INVALID_ROWRECORD_ARRAY,
		"The vector array is empty. Make sure you have entered vector records.");
		}

		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, "The size of vector ID array must be equal to the size of the vector.");
		return Status(SERVER_ILLEGAL_VECTOR_ID,
		"The size of vector ID array must be equal to the size of the vector.");
		}
		}

		@@ -458,7 +462,8 @@ InsertTask::OnExecute() {

		// user didn't provided id before, no need to provide user id
		if ((table_info.flag_ & engine::meta::FLAG_MASK_NO_USERID) != 0 && user_provide_ids) {
		return Status(SERVER_ILLEGAL_VECTOR_ID,
		return Status(
		SERVER_ILLEGAL_VECTOR_ID,
		"Table vector IDs are auto-generated. All vectors of this table must use auto-generated IDs.");
		}

		@@ -476,7 +481,8 @@ InsertTask::OnExecute() {
		// TODO(yk): change to one dimension array or use multiple-thread to copy the data
		for (size_t i = 0; i < insert_param_->row_record_array_size(); i++) {
		if (insert_param_->row_record_array(i).vector_data().empty()) {
		return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector dimension must be equal to the table dimension.");
		return Status(SERVER_INVALID_ROWRECORD_ARRAY,
		"The vector dimension must be equal to the table dimension.");
		}
		uint64_t vec_dim = insert_param_->row_record_array(i).vector_data().size();
		if (vec_dim != table_info.dimension_) {
		@@ -592,7 +598,8 @@ SearchTask::OnExecute() {
		}

		if (search_param_->query_record_array().empty()) {
		return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector array is empty. Make sure you have entered vector records.");
		return Status(SERVER_INVALID_ROWRECORD_ARRAY,
		"The vector array is empty. Make sure you have entered vector records.");
		}

		// step 4: check date range, and convert to db dates
		@@ -614,7 +621,8 @@ SearchTask::OnExecute() {
		std::vector<float> vec_f(record_array_size * table_info.dimension_, 0);
		for (size_t i = 0; i < record_array_size; i++) {
		if (search_param_->query_record_array(i).vector_data().empty()) {
		return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector dimension must be equal to the table dimension.");
		return Status(SERVER_INVALID_ROWRECORD_ARRAY,
		"The vector dimension must be equal to the table dimension.");
		}
		uint64_t query_vec_dim = search_param_->query_record_array(i).vector_data().size();
		if (query_vec_dim != table_info.dimension_) {

core/src/utils/ValidationUtil.cpp

+15 −15

Original line number	Diff line number	Diff line
		@@ -74,8 +74,8 @@ ValidationUtil::ValidateTableName(const std::string& table_name) {
		Status
		ValidationUtil::ValidateTableDimension(int64_t dimension) {
		if (dimension <= 0 \|\| dimension > TABLE_DIMENSION_LIMIT) {
		std::string msg = "Invalid table dimension: " + std::to_string(dimension) + ". "
		+ "The table dimension must be within the range of 1 ~ 16384.";
		std::string msg = "Invalid table dimension: " + std::to_string(dimension) + ". " +
		"The table dimension must be within the range of 1 ~ 16384.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_VECTOR_DIMENSION, msg);
		} else {
		@@ -87,8 +87,8 @@ Status
		ValidationUtil::ValidateTableIndexType(int32_t index_type) {
		int engine_type = static_cast<int>(engine::EngineType(index_type));
		if (engine_type <= 0 \|\| engine_type > static_cast<int>(engine::EngineType::MAX_VALUE)) {
		std::string msg = "Invalid index type: " + std::to_string(index_type) + ". "
		+ "Make sure the index type is in IndexType list.";
		std::string msg = "Invalid index type: " + std::to_string(index_type) + ". " +
		"Make sure the index type is in IndexType list.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_INDEX_TYPE, msg);
		}
		@@ -108,8 +108,8 @@ ValidationUtil::ValidateTableIndexType(int32_t index_type) {
		Status
		ValidationUtil::ValidateTableIndexNlist(int32_t nlist) {
		if (nlist <= 0) {
		std::string msg = "Invalid index nlist: " + std::to_string(nlist) + ". "
		+ "The index nlist must be greater than 0.";
		std::string msg =
		"Invalid index nlist: " + std::to_string(nlist) + ". " + "The index nlist must be greater than 0.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_INDEX_NLIST, msg);
		}
		@@ -120,9 +120,9 @@ ValidationUtil::ValidateTableIndexNlist(int32_t nlist) {
		Status
		ValidationUtil::ValidateTableIndexFileSize(int64_t index_file_size) {
		if (index_file_size <= 0 \|\| index_file_size > INDEX_FILE_SIZE_LIMIT) {
		std::string msg = "Invalid index file size: " + std::to_string(index_file_size) + ". "
		+ "The index file size must be within the range of 1 ~ "
		+ std::to_string(INDEX_FILE_SIZE_LIMIT) + ".";
		std::string msg = "Invalid index file size: " + std::to_string(index_file_size) + ". " +
		"The index file size must be within the range of 1 ~ " +
		std::to_string(INDEX_FILE_SIZE_LIMIT) + ".";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_INDEX_FILE_SIZE, msg);
		}
		@@ -134,8 +134,8 @@ Status
		ValidationUtil::ValidateTableIndexMetricType(int32_t metric_type) {
		if (metric_type != static_cast<int32_t>(engine::MetricType::L2) &&
		metric_type != static_cast<int32_t>(engine::MetricType::IP)) {
		std::string msg = "Invalid index metric type: " + std::to_string(metric_type) + ". "
		+ "Make sure the metric type is either MetricType.L2 or MetricType.IP.";
		std::string msg = "Invalid index metric type: " + std::to_string(metric_type) + ". " +
		"Make sure the metric type is either MetricType.L2 or MetricType.IP.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_INDEX_METRIC_TYPE, msg);
		}
		@@ -145,8 +145,8 @@ ValidationUtil::ValidateTableIndexMetricType(int32_t metric_type) {
		Status
		ValidationUtil::ValidateSearchTopk(int64_t top_k, const engine::meta::TableSchema& table_schema) {
		if (top_k <= 0 \|\| top_k > 2048) {
		std::string msg = "Invalid topk: " + std::to_string(top_k) + ". "
		+ "The topk must be within the range of 1 ~ 2048.";
		std::string msg =
		"Invalid topk: " + std::to_string(top_k) + ". " + "The topk must be within the range of 1 ~ 2048.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_TOPK, msg);
		}
		@@ -157,8 +157,8 @@ ValidationUtil::ValidateSearchTopk(int64_t top_k, const engine::meta::TableSchem
		Status
		ValidationUtil::ValidateSearchNprobe(int64_t nprobe, const engine::meta::TableSchema& table_schema) {
		if (nprobe <= 0 \|\| nprobe > table_schema.nlist_) {
		std::string msg = "Invalid nprobe: " + std::to_string(nprobe) + ". "
		+ "The nprobe must be within the range of 1 ~ index nlist.";
		std::string msg = "Invalid nprobe: " + std::to_string(nprobe) + ". " +
		"The nprobe must be within the range of 1 ~ index nlist.";
		SERVER_LOG_ERROR << msg;
		return Status(SERVER_INVALID_NPROBE, msg);
		}