diff --git a/internal/core/src/common/Types.h b/internal/core/src/common/Types.h index 21236db11d..9e24f0836f 100644 --- a/internal/core/src/common/Types.h +++ b/internal/core/src/common/Types.h @@ -60,8 +60,8 @@ struct SearchResult { SearchResult() = default; SearchResult(int64_t num_queries, int64_t topk) : topk_(topk), num_queries_(num_queries) { auto count = get_row_count(); - result_distances_.resize(count); - internal_seg_offsets_.resize(count); + distances_.resize(count); + ids_.resize(count); } int64_t @@ -72,8 +72,8 @@ struct SearchResult { public: int64_t num_queries_; int64_t topk_; - std::vector result_distances_; - std::vector internal_seg_offsets_; + std::vector distances_; + std::vector ids_; public: // TODO(gexi): utilize these field diff --git a/internal/core/src/query/SearchOnGrowing.cpp b/internal/core/src/query/SearchOnGrowing.cpp index 49f6a1c3e5..2ee6fac1ee 100644 --- a/internal/core/src/query/SearchOnGrowing.cpp +++ b/internal/core/src/query/SearchOnGrowing.cpp @@ -101,8 +101,8 @@ FloatSearch(const segcore::SegmentGrowingImpl& segment, final_qr.merge(sub_qr); } current_chunk_id = max_chunk; - results.result_distances_ = std::move(final_qr.mutable_values()); - results.internal_seg_offsets_ = std::move(final_qr.mutable_labels()); + results.distances_ = std::move(final_qr.mutable_values()); + results.ids_ = std::move(final_qr.mutable_labels()); results.topk_ = topk; results.num_queries_ = num_queries; @@ -164,8 +164,8 @@ BinarySearch(const segcore::SegmentGrowingImpl& segment, } final_result.round_values(); - results.result_distances_ = std::move(final_result.mutable_values()); - results.internal_seg_offsets_ = std::move(final_result.mutable_labels()); + results.distances_ = std::move(final_result.mutable_values()); + results.ids_ = std::move(final_result.mutable_labels()); results.topk_ = topk; results.num_queries_ = num_queries; diff --git a/internal/core/src/query/SearchOnSealed.cpp b/internal/core/src/query/SearchOnSealed.cpp index e9f2364b4b..2dee79aaa7 100644 --- a/internal/core/src/query/SearchOnSealed.cpp +++ b/internal/core/src/query/SearchOnSealed.cpp @@ -105,12 +105,12 @@ SearchOnSealed(const Schema& schema, distances[i] = round(distances[i] * multiplier) / multiplier; } } - result.internal_seg_offsets_.resize(total_num); - result.result_distances_.resize(total_num); + result.ids_.resize(total_num); + result.distances_.resize(total_num); result.num_queries_ = num_queries; result.topk_ = topk; - std::copy_n(ids, total_num, result.internal_seg_offsets_.data()); - std::copy_n(distances, total_num, result.result_distances_.data()); + std::copy_n(ids, total_num, result.ids_.data()); + std::copy_n(distances, total_num, result.distances_.data()); } } // namespace milvus::query diff --git a/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp b/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp index e6a7d043a2..6d15991662 100644 --- a/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp +++ b/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp @@ -68,8 +68,8 @@ empty_search_result(int64_t num_queries, int64_t topk, int64_t round_decimal, Me SubSearchResult result(num_queries, topk, metric_type, round_decimal); final_result.num_queries_ = num_queries; final_result.topk_ = topk; - final_result.internal_seg_offsets_ = std::move(result.mutable_labels()); - final_result.result_distances_ = std::move(result.mutable_values()); + final_result.ids_ = std::move(result.mutable_labels()); + final_result.distances_ = std::move(result.mutable_values()); return final_result; } diff --git a/internal/core/src/segcore/ReduceStructure.h b/internal/core/src/segcore/ReduceStructure.h index dc7047395e..586bf2c978 100644 --- a/internal/core/src/segcore/ReduceStructure.h +++ b/internal/core/src/segcore/ReduceStructure.h @@ -53,7 +53,7 @@ struct SearchResultPair { offset_++; if (offset_ < offset_rb_) { primary_key_ = search_result_->primary_keys_.at(offset_); - distance_ = search_result_->result_distances_.at(offset_); + distance_ = search_result_->distances_.at(offset_); } else { primary_key_ = INVALID_ID; distance_ = MAXFLOAT; diff --git a/internal/core/src/segcore/SegmentInterface.cpp b/internal/core/src/segcore/SegmentInterface.cpp index 4669e3fe1d..3ea15d4143 100644 --- a/internal/core/src/segcore/SegmentInterface.cpp +++ b/internal/core/src/segcore/SegmentInterface.cpp @@ -18,22 +18,21 @@ void SegmentInternalInterface::FillPrimaryKeys(const query::Plan* plan, SearchResult& results) const { std::shared_lock lck(mutex_); AssertInfo(plan, "empty plan"); - auto size = results.result_distances_.size(); - AssertInfo(results.internal_seg_offsets_.size() == size, - "Size of result distances is not equal to size of segment offsets"); + auto size = results.distances_.size(); + AssertInfo(results.ids_.size() == size, "Size of result distances is not equal to size of ids"); Assert(results.primary_keys_.size() == 0); results.primary_keys_.resize(size); auto element_sizeof = sizeof(int64_t); aligned_vector blob(size * element_sizeof); if (plan->schema_.get_is_auto_id()) { - bulk_subscript(SystemFieldType::RowId, results.internal_seg_offsets_.data(), size, blob.data()); + bulk_subscript(SystemFieldType::RowId, results.ids_.data(), size, blob.data()); } else { auto key_offset_opt = get_schema().get_primary_key_offset(); AssertInfo(key_offset_opt.has_value(), "Cannot get primary key offset from schema"); auto key_offset = key_offset_opt.value(); AssertInfo(get_schema()[key_offset].get_data_type() == DataType::INT64, "Primary key field is not INT64 type"); - bulk_subscript(key_offset, results.internal_seg_offsets_.data(), size, blob.data()); + bulk_subscript(key_offset, results.ids_.data(), size, blob.data()); } memcpy(results.primary_keys_.data(), blob.data(), element_sizeof * size); @@ -43,9 +42,8 @@ void SegmentInternalInterface::FillTargetEntry(const query::Plan* plan, SearchResult& results) const { std::shared_lock lck(mutex_); AssertInfo(plan, "empty plan"); - auto size = results.result_distances_.size(); - AssertInfo(results.internal_seg_offsets_.size() == size, - "Size of result distances is not equal to size of segment offsets"); + auto size = results.distances_.size(); + AssertInfo(results.ids_.size() == size, "Size of result distances is not equal to size of ids"); Assert(results.row_data_.size() == 0); std::vector element_sizeofs; @@ -55,14 +53,14 @@ SegmentInternalInterface::FillTargetEntry(const query::Plan* plan, SearchResult& { aligned_vector blob(size * sizeof(int64_t)); if (plan->schema_.get_is_auto_id()) { - bulk_subscript(SystemFieldType::RowId, results.internal_seg_offsets_.data(), size, blob.data()); + bulk_subscript(SystemFieldType::RowId, results.ids_.data(), size, blob.data()); } else { auto key_offset_opt = get_schema().get_primary_key_offset(); AssertInfo(key_offset_opt.has_value(), "Cannot get primary key offset from schema"); auto key_offset = key_offset_opt.value(); AssertInfo(get_schema()[key_offset].get_data_type() == DataType::INT64, "Primary key field is not INT64 type"); - bulk_subscript(key_offset, results.internal_seg_offsets_.data(), size, blob.data()); + bulk_subscript(key_offset, results.ids_.data(), size, blob.data()); } blobs.emplace_back(std::move(blob)); element_sizeofs.push_back(sizeof(int64_t)); @@ -73,7 +71,7 @@ SegmentInternalInterface::FillTargetEntry(const query::Plan* plan, SearchResult& auto& field_meta = get_schema()[field_offset]; auto element_sizeof = field_meta.get_sizeof(); aligned_vector blob(size * element_sizeof); - bulk_subscript(field_offset, results.internal_seg_offsets_.data(), size, blob.data()); + bulk_subscript(field_offset, results.ids_.data(), size, blob.data()); blobs.emplace_back(std::move(blob)); element_sizeofs.push_back(element_sizeof); } diff --git a/internal/core/src/segcore/SegmentSealedImpl.cpp b/internal/core/src/segcore/SegmentSealedImpl.cpp index e622d7ed0a..600c4b8b37 100644 --- a/internal/core/src/segcore/SegmentSealedImpl.cpp +++ b/internal/core/src/segcore/SegmentSealedImpl.cpp @@ -351,8 +351,8 @@ SegmentSealedImpl::vector_search(int64_t vec_count, }(); SearchResult results; - results.result_distances_ = std::move(sub_qr.mutable_values()); - results.internal_seg_offsets_ = std::move(sub_qr.mutable_labels()); + results.distances_ = std::move(sub_qr.mutable_values()); + results.ids_ = std::move(sub_qr.mutable_labels()); results.topk_ = dataset.topk; results.num_queries_ = dataset.num_queries; diff --git a/internal/core/src/segcore/reduce_c.cpp b/internal/core/src/segcore/reduce_c.cpp index 428f78b0af..8a7e706d39 100644 --- a/internal/core/src/segcore/reduce_c.cpp +++ b/internal/core/src/segcore/reduce_c.cpp @@ -60,8 +60,7 @@ DeleteMarshaledHits(CMarshaledHits c_marshaled_hits) { // const int64_t MAXLEN = 32; // snprintf(buf + strlen(buf), MAXLEN, "{ seg No.%ld ", seg_idx); // for (int64_t i = from; i < to; i++) { -// snprintf(buf + strlen(buf), MAXLEN, "(%ld, %ld, %f), ", i, result->primary_keys_[i], -// result->result_distances_[i]); +// snprintf(buf + strlen(buf), MAXLEN, "(%ld, %ld, %f), ", i, result->primary_keys_[i], result->distances_[i]); // } // snprintf(buf + strlen(buf), MAXLEN, "} "); //} @@ -75,7 +74,7 @@ ReduceResultData(std::vector& search_results, int64_t nq, int64_t auto search_result = search_results[i]; AssertInfo(search_result != nullptr, "search result must not equal to nullptr"); AssertInfo(search_result->primary_keys_.size() == nq * topk, "incorrect search result primary key size"); - AssertInfo(search_result->result_distances_.size() == nq * topk, "incorrect search result distance size"); + AssertInfo(search_result->distances_.size() == nq * topk, "incorrect search result distance size"); } std::vector> search_records(num_segments); @@ -89,7 +88,7 @@ ReduceResultData(std::vector& search_results, int64_t nq, int64_t for (int i = 0; i < num_segments; i++) { auto search_result = search_results[i]; auto primary_key = search_result->primary_keys_[base_offset]; - auto distance = search_result->result_distances_[base_offset]; + auto distance = search_result->distances_[base_offset]; result_pairs.push_back( SearchResultPair(primary_key, distance, search_result, i, base_offset, base_offset + topk)); } @@ -130,7 +129,7 @@ ReduceResultData(std::vector& search_results, int64_t nq, int64_t } LOG_SEGCORE_DEBUG_ << "skip duplicated search result, count = " << skip_dup_cnt; - // after reduce, remove redundant values in primary_keys, result_distances and internal_seg_offsets + // after reduce, remove redundant values in primary_keys, distances and ids for (int i = 0; i < num_segments; i++) { auto search_result = search_results[i]; if (search_result->result_offsets_.size() == 0) { @@ -138,19 +137,18 @@ ReduceResultData(std::vector& search_results, int64_t nq, int64_t } std::vector primary_keys; - std::vector result_distances; - std::vector internal_seg_offsets; + std::vector distances; + std::vector ids; for (int j = 0; j < search_records[i].size(); j++) { auto& offset = search_records[i][j]; primary_keys.push_back(offset != INVALID_OFFSET ? search_result->primary_keys_[offset] : INVALID_ID); - result_distances.push_back(offset != INVALID_OFFSET ? search_result->result_distances_[offset] : MAXFLOAT); - internal_seg_offsets.push_back(offset != INVALID_OFFSET ? search_result->internal_seg_offsets_[offset] - : INVALID_SEG_OFFSET); + distances.push_back(offset != INVALID_OFFSET ? search_result->distances_[offset] : MAXFLOAT); + ids.push_back(offset != INVALID_OFFSET ? search_result->ids_[offset] : INVALID_ID); } search_result->primary_keys_ = primary_keys; - search_result->result_distances_ = result_distances; - search_result->internal_seg_offsets_ = internal_seg_offsets; + search_result->distances_ = distances; + search_result->ids_ = ids; } } @@ -213,7 +211,7 @@ ReorganizeSearchResults(CMarshaledHits* c_marshaled_hits, CSearchResult* c_searc #pragma omp parallel for for (int j = 0; j < size; j++) { auto loc = search_result->result_offsets_[j]; - result_distances[loc] = search_result->result_distances_[j]; + result_distances[loc] = search_result->distances_[j]; row_datas[loc] = search_result->row_data_[j]; } counts[i] = size; diff --git a/internal/core/src/segcore/segment_c.cpp b/internal/core/src/segcore/segment_c.cpp index b75a951554..4ac74c9c3e 100644 --- a/internal/core/src/segcore/segment_c.cpp +++ b/internal/core/src/segcore/segment_c.cpp @@ -70,7 +70,7 @@ Search(CSegmentInterface c_segment, *search_result = segment->Search(plan, *phg_ptr, timestamp); // if (plan->plan_node_->search_info_.metric_type_ != milvus::MetricType::METRIC_INNER_PRODUCT) { if (!milvus::segcore::PositivelyRelated(plan->plan_node_->search_info_.metric_type_)) { - for (auto& dis : search_result->result_distances_) { + for (auto& dis : search_result->distances_) { dis *= -1; } } diff --git a/internal/core/unittest/test_c_api.cpp b/internal/core/unittest/test_c_api.cpp index 8cf0cdda99..881d0a1151 100644 --- a/internal/core/unittest/test_c_api.cpp +++ b/internal/core/unittest/test_c_api.cpp @@ -956,8 +956,8 @@ TEST(CApiTest, Indexing_Without_Predicate) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1075,8 +1075,8 @@ TEST(CApiTest, Indexing_Expr_Without_Predicate) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1212,8 +1212,8 @@ TEST(CApiTest, Indexing_With_float_Predicate_Range) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1241,9 +1241,9 @@ TEST(CApiTest, Indexing_With_float_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -1364,8 +1364,8 @@ TEST(CApiTest, Indexing_Expr_With_float_Predicate_Range) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1393,9 +1393,9 @@ TEST(CApiTest, Indexing_Expr_With_float_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 420000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 420000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -1500,8 +1500,8 @@ TEST(CApiTest, Indexing_With_float_Predicate_Term) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1529,9 +1529,9 @@ TEST(CApiTest, Indexing_With_float_Predicate_Term) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -1645,8 +1645,8 @@ TEST(CApiTest, Indexing_Expr_With_float_Predicate_Term) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1674,9 +1674,9 @@ TEST(CApiTest, Indexing_Expr_With_float_Predicate_Term) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 420000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 420000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -1783,8 +1783,8 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1812,9 +1812,9 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 420000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 420000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -1934,8 +1934,8 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -1963,9 +1963,9 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], + search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -2071,8 +2071,8 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -2105,9 +2105,8 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -2221,8 +2220,8 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) { } auto search_result_on_raw_index = (SearchResult*)c_search_result_on_smallIndex; - search_result_on_raw_index->internal_seg_offsets_ = vec_ids; - search_result_on_raw_index->result_distances_ = vec_dis; + search_result_on_raw_index->ids_ = vec_ids; + search_result_on_raw_index->distances_ = vec_dis; auto binary_set = indexing->Serialize(conf); void* c_load_index_info = nullptr; @@ -2255,9 +2254,8 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(search_result_on_bigIndex.result_distances_[offset], - search_result_on_raw_index->result_distances_[offset]); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.distances_[offset], search_result_on_raw_index->distances_[offset]); } DeleteLoadIndexInfo(c_load_index_info); @@ -2458,7 +2456,7 @@ TEST(CApiTest, SealedSegment_search_float_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); } DeleteLoadIndexInfo(c_load_index_info); @@ -2718,7 +2716,7 @@ TEST(CApiTest, SealedSegment_search_float_With_Expr_Predicate_Range) { auto search_result_on_bigIndex = (*(SearchResult*)c_search_result_on_bigIndex); for (int i = 0; i < num_queries; ++i) { auto offset = i * TOPK; - ASSERT_EQ(search_result_on_bigIndex.internal_seg_offsets_[offset], 42000 + i); + ASSERT_EQ(search_result_on_bigIndex.ids_[offset], 42000 + i); } DeleteLoadIndexInfo(c_load_index_info); diff --git a/internal/core/unittest/test_indexing.cpp b/internal/core/unittest/test_indexing.cpp index 7d15cc505f..e8dd47b4bc 100644 --- a/internal/core/unittest/test_indexing.cpp +++ b/internal/core/unittest/test_indexing.cpp @@ -242,8 +242,8 @@ TEST(Indexing, BinaryBruteForce) { SearchResult sr; sr.num_queries_ = num_queries; sr.topk_ = topk; - sr.internal_seg_offsets_ = std::move(sub_result.mutable_labels()); - sr.result_distances_ = std::move(sub_result.mutable_values()); + sr.ids_ = std::move(sub_result.mutable_labels()); + sr.distances_ = std::move(sub_result.mutable_values()); auto json = SearchResultToJson(sr); std::cout << json.dump(2); diff --git a/internal/core/unittest/test_query.cpp b/internal/core/unittest/test_query.cpp index 374e94ab49..0489bced04 100644 --- a/internal/core/unittest/test_query.cpp +++ b/internal/core/unittest/test_query.cpp @@ -405,11 +405,11 @@ TEST(Query, ExecEmpty) { auto sr = segment->Search(plan.get(), *ph_group, time); std::cout << SearchResultToJson(sr); - for (auto i : sr.internal_seg_offsets_) { + for (auto i : sr.ids_) { ASSERT_EQ(i, -1); } - for (auto v : sr.result_distances_) { + for (auto v : sr.distances_) { ASSERT_EQ(v, std::numeric_limits::max()); } } @@ -675,7 +675,7 @@ TEST(Query, FillSegment) { int64_t val; memcpy(&val, vec.data(), sizeof(int64_t)); - auto internal_offset = result.internal_seg_offsets_[std_index]; + auto internal_offset = result.ids_[std_index]; auto std_val = std_vec[internal_offset]; auto std_i32 = std_i32_vec[internal_offset]; std::vector std_vfloat(dim); diff --git a/internal/core/unittest/test_sealed.cpp b/internal/core/unittest/test_sealed.cpp index 268d852111..4ee79fd9dc 100644 --- a/internal/core/unittest/test_sealed.cpp +++ b/internal/core/unittest/test_sealed.cpp @@ -100,8 +100,8 @@ TEST(Sealed, without_predicate) { std::vector vec_ids(ids, ids + topK * num_queries); std::vector vec_dis(dis, dis + topK * num_queries); - sr.internal_seg_offsets_ = vec_ids; - sr.result_distances_ = vec_dis; + sr.ids_ = vec_ids; + sr.distances_ = vec_dis; auto ref_result = SearchResultToJson(sr); LoadIndexInfo load_info; @@ -208,8 +208,8 @@ TEST(Sealed, with_predicate) { auto post_sr = sr; for (int i = 0; i < num_queries; ++i) { auto offset = i * topK; - ASSERT_EQ(post_sr.internal_seg_offsets_[offset], 42000 + i); - ASSERT_EQ(post_sr.result_distances_[offset], 0.0); + ASSERT_EQ(post_sr.ids_[offset], 42000 + i); + ASSERT_EQ(post_sr.distances_[offset], 0.0); } } diff --git a/internal/core/unittest/test_utils/DataGen.h b/internal/core/unittest/test_utils/DataGen.h index a4c9720767..ef3fef2000 100644 --- a/internal/core/unittest/test_utils/DataGen.h +++ b/internal/core/unittest/test_utils/DataGen.h @@ -290,8 +290,7 @@ SearchResultToJson(const SearchResult& sr) { std::vector result; for (int k = 0; k < topk; ++k) { int index = q * topk + k; - result.emplace_back(std::to_string(sr.internal_seg_offsets_[index]) + "->" + - std::to_string(sr.result_distances_[index])); + result.emplace_back(std::to_string(sr.ids_[index]) + "->" + std::to_string(sr.distances_[index])); } results.emplace_back(std::move(result)); }