Skip to content

[0.8] [MOD-11651] Fix wrong template type deduction in GenerateAndAddVector #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 0.8
Choose a base branch
from
Open

[0.8] [MOD-11651] Fix wrong template type deduction in GenerateAndAddVector #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/unit/test_bruteforce_multi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ TYPED_TEST(BruteForceMultiTest, rangeQuery) {
GenerateAndAddVector<TEST_DATA_T>(index, dim, i, i);
// Add some vectors, worst than the second loop (for the given query)
for (size_t j = 0; j < per_label - 1; j++)
GenerateAndAddVector(index, dim, i, (TEST_DATA_T)i + n);
GenerateAndAddVector<TEST_DATA_T>(index, dim, i, (TEST_DATA_T)i + n);
}

ASSERT_EQ(VecSimIndex_IndexSize(index), n);
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_hnsw_tiered.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ TYPED_TEST(HNSWTieredIndexTest, deleteFromHNSWWithRepairJobExec) {
auto allocator = tiered_index->getAllocator();

for (size_t i = 0; i < n; i++) {
GenerateAndAddVector(tiered_index->getHNSWIndex(), dim, i, i);
GenerateAndAddVector<TEST_DATA_T>(tiered_index->getHNSWIndex(), dim, i, i);
}

// Delete vectors one by one and run the resulted repair jobs.
Expand Down Expand Up @@ -2703,7 +2703,7 @@ TYPED_TEST(HNSWTieredIndexTest, testInfo) {
ASSERT_EQ(info.commonInfo.basicInfo.type, s_info.type);
ASSERT_EQ(info.commonInfo.basicInfo.isTiered, s_info.isTiered);

GenerateAndAddVector(tiered_index, dim, 1, 1);
GenerateAndAddVector<TEST_DATA_T>(tiered_index, dim, 1, 1);
info = tiered_index->debugInfo();
stats = tiered_index->statisticInfo();

Expand Down Expand Up @@ -2736,7 +2736,7 @@ TYPED_TEST(HNSWTieredIndexTest, testInfo) {
EXPECT_EQ(info.tieredInfo.backgroundIndexing, false);

if (TypeParam::isMulti()) {
GenerateAndAddVector(tiered_index, dim, 1, 1);
GenerateAndAddVector<TEST_DATA_T>(tiered_index, dim, 1, 1);
info = tiered_index->debugInfo();
stats = tiered_index->statisticInfo();

Expand Down Expand Up @@ -2785,7 +2785,7 @@ TYPED_TEST(HNSWTieredIndexTest, testInfoIterator) {
auto *tiered_index = this->CreateTieredHNSWIndex(hnsw_params, mock_thread_pool, 1);
auto allocator = tiered_index->getAllocator();

GenerateAndAddVector(tiered_index, dim, 1, 1);
GenerateAndAddVector<TEST_DATA_T>(tiered_index, dim, 1, 1);
VecSimIndexDebugInfo info = tiered_index->debugInfo();
VecSimIndexDebugInfo frontendIndexInfo = tiered_index->frontendIndex->debugInfo();
VecSimIndexDebugInfo backendIndexInfo = tiered_index->backendIndex->debugInfo();
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ static void GenerateVector(data_t *output, size_t dim, data_t value = 1.0) {
}
}

// use std::type_identity to force explicit template specification.
template <typename data_t>
int GenerateAndAddVector(VecSimIndex *index, size_t dim, size_t id, data_t value = 1.0) {
int GenerateAndAddVector(VecSimIndex *index, size_t dim, size_t id,
typename std::type_identity<data_t>::type value = 1.0) {
data_t v[dim];
GenerateVector(v, dim, value);
return VecSimIndex_AddVector(index, v, id);
Expand Down
Loading