Skip to content

Commit ba4cd68

Browse files
SpadeA-TangSpadeA-Tang
authored
fix: adjust params to make CPP UT run faster (#44223)
fix: #44224 --------- Signed-off-by: SpadeA <tangchenjie1210@gmail.com>
1 parent c71b47b commit ba4cd68

11 files changed

+158
-184
lines changed

‎internal/core/unittest/test_binlog_index.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class BinlogIndexTest : public ::testing::TestWithParam<Param> {
117117
{"index_type", index_type},
118118
{"metric_type", metric_type},
119119
{"nlist", "64"}};
120-
std::map<std::string, std::string> type_params = {{"dim", "128"}};
120+
std::map<std::string, std::string> type_params = {{"dim", "4"}};
121121
FieldIndexMeta fieldIndexMeta(
122122
vec_field_id, std::move(index_params), std::move(type_params));
123123
auto& config = SegcoreConfig::default_config();
@@ -166,7 +166,7 @@ class BinlogIndexTest : public ::testing::TestWithParam<Param> {
166166
std::optional<std::string> dense_vec_intermin_index_type = std::nullopt;
167167
std::string index_type;
168168
size_t data_n = 5000;
169-
size_t data_d = 128;
169+
size_t data_d = 4;
170170
size_t topk = 10;
171171
milvus::FieldDataPtr vec_field_data = nullptr;
172172
milvus::segcore::SegmentSealedUPtr segment = nullptr;
@@ -459,4 +459,4 @@ TEST_P(BinlogIndexTest, LoadBinlogWithoutIndexMeta) {
459459
EXPECT_FALSE(segment->HasIndex(vec_field_id));
460460
EXPECT_EQ(segment->get_row_count(), data_n);
461461
EXPECT_TRUE(segment->HasFieldData(vec_field_id));
462-
}
462+
}

‎internal/core/unittest/test_c_api.cpp‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ using milvus::index::VectorIndex;
6363
using milvus::segcore::LoadIndexInfo;
6464

6565
namespace {
66-
// const int DIM = 16;
66+
// const int DIM = 4;
6767
const int64_t ROW_COUNT = 10 * 1000;
6868
const int64_t BIAS = 4200;
6969

@@ -130,7 +130,7 @@ get_default_index_meta() {
130130
index_name: "test-index"
131131
type_params: <
132132
key: "dim"
133-
value: "16"
133+
value: "4"
134134
>
135135
index_params: <
136136
key: "index_type"
@@ -3006,12 +3006,13 @@ TEST(CApiTest, Indexing_Expr_With_float_Predicate_Term) {
30063006
}
30073007

30083008
TEST(CApiTest, Indexing_With_binary_Predicate_Range) {
3009+
auto dim = 16;
30093010
// insert data to segment
30103011
constexpr auto TOPK = 5;
30113012

30123013
std::string schema_string =
30133014
generate_collection_schema<milvus::BinaryVector>(
3014-
knowhere::metric::JACCARD, DIM);
3015+
knowhere::metric::JACCARD, dim);
30153016
auto collection =
30163017
NewCollection(schema_string.c_str(), knowhere::metric::JACCARD);
30173018
auto schema = ((segcore::Collection*)collection)->get_schema();
@@ -3022,7 +3023,7 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) {
30223023
auto N = ROW_COUNT;
30233024
auto dataset = DataGen(schema, N);
30243025
auto vec_col = dataset.get_col<uint8_t>(FieldId(100));
3025-
auto query_ptr = vec_col.data() + BIAS * DIM / 8;
3026+
auto query_ptr = vec_col.data() + BIAS * dim / 8;
30263027

30273028
int64_t offset;
30283029
PreInsert(segment, N, &offset);
@@ -3081,7 +3082,7 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) {
30813082
// create place_holder_group
30823083
int num_queries = 5;
30833084
auto raw_group = CreatePlaceholderGroupFromBlob<milvus::BinaryVector>(
3084-
num_queries, DIM, query_ptr);
3085+
num_queries, dim, query_ptr);
30853086
auto blob = raw_group.SerializeAsString();
30863087

30873088
// search on segment's small index
@@ -3113,11 +3114,11 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) {
31133114
DataType::VECTOR_BINARY,
31143115
knowhere::metric::JACCARD,
31153116
IndexEnum::INDEX_FAISS_BIN_IVFFLAT,
3116-
DIM,
3117+
dim,
31173118
N);
31183119

31193120
// gen query dataset
3120-
auto query_dataset = knowhere::GenDataSet(num_queries, DIM, query_ptr);
3121+
auto query_dataset = knowhere::GenDataSet(num_queries, dim, query_ptr);
31213122
auto vec_index = dynamic_cast<VectorIndex*>(indexing.get());
31223123
auto search_plan = reinterpret_cast<milvus::query::Plan*>(plan);
31233124
SearchInfo search_info = search_plan->plan_node_->search_info_;
@@ -3189,10 +3190,11 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Range) {
31893190
TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) {
31903191
// insert data to segment
31913192
constexpr auto TOPK = 5;
3193+
auto dim = 16;
31923194

31933195
std::string schema_string =
31943196
generate_collection_schema<milvus::BinaryVector>(
3195-
knowhere::metric::JACCARD, DIM);
3197+
knowhere::metric::JACCARD, dim);
31963198
auto collection =
31973199
NewCollection(schema_string.c_str(), knowhere::metric::JACCARD);
31983200
auto schema = ((segcore::Collection*)collection)->get_schema();
@@ -3203,7 +3205,7 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) {
32033205
auto N = ROW_COUNT;
32043206
auto dataset = DataGen(schema, N);
32053207
auto vec_col = dataset.get_col<uint8_t>(FieldId(100));
3206-
auto query_ptr = vec_col.data() + BIAS * DIM / 8;
3208+
auto query_ptr = vec_col.data() + BIAS * dim / 8;
32073209

32083210
int64_t offset;
32093211
PreInsert(segment, N, &offset);
@@ -3261,7 +3263,7 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) {
32613263
// create place_holder_group
32623264
int num_queries = 5;
32633265
auto raw_group = CreatePlaceholderGroupFromBlob<milvus::BinaryVector>(
3264-
num_queries, DIM, query_ptr);
3266+
num_queries, dim, query_ptr);
32653267
auto blob = raw_group.SerializeAsString();
32663268

32673269
// search on segment's small index
@@ -3294,11 +3296,11 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) {
32943296
DataType::VECTOR_BINARY,
32953297
knowhere::metric::JACCARD,
32963298
IndexEnum::INDEX_FAISS_BIN_IVFFLAT,
3297-
DIM,
3299+
dim,
32983300
N);
32993301

33003302
// gen query dataset
3301-
auto query_dataset = knowhere::GenDataSet(num_queries, DIM, query_ptr);
3303+
auto query_dataset = knowhere::GenDataSet(num_queries, dim, query_ptr);
33023304
auto vec_index = dynamic_cast<VectorIndex*>(indexing.get());
33033305
auto search_plan = reinterpret_cast<milvus::query::Plan*>(plan);
33043306
SearchInfo search_info = search_plan->plan_node_->search_info_;
@@ -3370,10 +3372,11 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Range) {
33703372
TEST(CApiTest, Indexing_With_binary_Predicate_Term) {
33713373
// insert data to segment
33723374
constexpr auto TOPK = 5;
3375+
auto dim = 16;
33733376

33743377
std::string schema_string =
33753378
generate_collection_schema<milvus::BinaryVector>(
3376-
knowhere::metric::JACCARD, DIM);
3379+
knowhere::metric::JACCARD, dim);
33773380
auto collection =
33783381
NewCollection(schema_string.c_str(), knowhere::metric::JACCARD);
33793382
auto schema = ((segcore::Collection*)collection)->get_schema();
@@ -3384,7 +3387,7 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) {
33843387
auto N = ROW_COUNT;
33853388
auto dataset = DataGen(schema, N);
33863389
auto vec_col = dataset.get_col<uint8_t>(FieldId(100));
3387-
auto query_ptr = vec_col.data() + BIAS * DIM / 8;
3390+
auto query_ptr = vec_col.data() + BIAS * dim / 8;
33883391

33893392
int64_t offset;
33903393
PreInsert(segment, N, &offset);
@@ -3438,7 +3441,7 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) {
34383441
int num_queries = 5;
34393442
int topK = 5;
34403443
auto raw_group = CreatePlaceholderGroupFromBlob<milvus::BinaryVector>(
3441-
num_queries, DIM, query_ptr);
3444+
num_queries, dim, query_ptr);
34423445
auto blob = raw_group.SerializeAsString();
34433446

34443447
// search on segment's small index
@@ -3469,11 +3472,11 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) {
34693472
DataType::VECTOR_BINARY,
34703473
knowhere::metric::JACCARD,
34713474
IndexEnum::INDEX_FAISS_BIN_IVFFLAT,
3472-
DIM,
3475+
dim,
34733476
N);
34743477

34753478
// gen query dataset
3476-
auto query_dataset = knowhere::GenDataSet(num_queries, DIM, query_ptr);
3479+
auto query_dataset = knowhere::GenDataSet(num_queries, dim, query_ptr);
34773480
auto vec_index = dynamic_cast<VectorIndex*>(indexing.get());
34783481
auto search_plan = reinterpret_cast<milvus::query::Plan*>(plan);
34793482
SearchInfo search_info = search_plan->plan_node_->search_info_;
@@ -3568,10 +3571,11 @@ TEST(CApiTest, Indexing_With_binary_Predicate_Term) {
35683571
TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) {
35693572
// insert data to segment
35703573
constexpr auto TOPK = 5;
3574+
auto dim = 16;
35713575

35723576
std::string schema_string =
35733577
generate_collection_schema<milvus::BinaryVector>(
3574-
knowhere::metric::JACCARD, DIM);
3578+
knowhere::metric::JACCARD, dim);
35753579
auto collection =
35763580
NewCollection(schema_string.c_str(), knowhere::metric::JACCARD);
35773581
auto schema = ((segcore::Collection*)collection)->get_schema();
@@ -3582,7 +3586,7 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) {
35823586
auto N = ROW_COUNT;
35833587
auto dataset = DataGen(schema, N);
35843588
auto vec_col = dataset.get_col<uint8_t>(FieldId(100));
3585-
auto query_ptr = vec_col.data() + BIAS * DIM / 8;
3589+
auto query_ptr = vec_col.data() + BIAS * dim / 8;
35863590

35873591
int64_t offset;
35883592
PreInsert(segment, N, &offset);
@@ -3635,7 +3639,7 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) {
36353639
int num_queries = 5;
36363640
int topK = 5;
36373641
auto raw_group = CreatePlaceholderGroupFromBlob<milvus::BinaryVector>(
3638-
num_queries, DIM, query_ptr);
3642+
num_queries, dim, query_ptr);
36393643
auto blob = raw_group.SerializeAsString();
36403644

36413645
// search on segment's small index
@@ -3667,11 +3671,11 @@ TEST(CApiTest, Indexing_Expr_With_binary_Predicate_Term) {
36673671
DataType::VECTOR_BINARY,
36683672
knowhere::metric::JACCARD,
36693673
IndexEnum::INDEX_FAISS_BIN_IVFFLAT,
3670-
DIM,
3674+
dim,
36713675
N);
36723676

36733677
// gen query dataset
3674-
auto query_dataset = knowhere::GenDataSet(num_queries, DIM, query_ptr);
3678+
auto query_dataset = knowhere::GenDataSet(num_queries, dim, query_ptr);
36753679
auto vec_index = dynamic_cast<VectorIndex*>(indexing.get());
36763680
auto search_plan = reinterpret_cast<milvus::query::Plan*>(plan);
36773681
SearchInfo search_info = search_plan->plan_node_->search_info_;

‎internal/core/unittest/test_c_stream_reduce.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ TEST(CApiTest, StreamReduceGroupBY) {
154154
int N = 300;
155155
int topK = 100;
156156
int num_queries = 2;
157-
int dim = 16;
157+
int dim = 4;
158158
namespace schema = milvus::proto::schema;
159159

160160
void* c_collection;

0 commit comments

Comments
 (0)