Skip to content

M
milvus

milvus / milvus
12 个月 前同步成功

通知 261
Star 22476
Fork 2472
M
milvus

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 2d8e8669 编写于 作者: C Cai Yudong 提交者： GitHub
浏览文件
操作

Format test_expr.cpp (#9698) 

Signed-off-by: Nyudong.cai <yudong.cai@zilliz.com>
上级 e790ba3e
隐藏空白更改
内联 并排
Showing with 144 addition and 152 deletion
internal/core/unittest/test_expr.cpp
浏览文件 @ 2d8e8669
......@@ -71,34 +71,33 @@ TEST(Expr, Range) {
using namespace milvus;
using namespace milvus::query;
using namespace milvus::segcore;
std::string dsl_string = R"(
{
"bool": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
std::string dsl_string = R"({
"bool": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
}
}
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_FLOAT, 16, MetricType::METRIC_L2);
schema->AddDebugField("age", DataType::INT32);
......@@ -114,34 +113,33 @@ TEST(Expr, RangeBinary) {
using namespace milvus;
using namespace milvus::query;
using namespace milvus::segcore;
std::string dsl_string = R"(
{
"bool": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
std::string dsl_string = R"({
"bool": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
}
}
}
},
{
"vector": {
"fakevec": {
"metric_type": "Jaccard",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
},
{
"vector": {
"fakevec": {
"metric_type": "Jaccard",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_BINARY, 512, MetricType::METRIC_Jaccard);
schema->AddDebugField("age", DataType::INT32);
......@@ -195,33 +193,32 @@ TEST(Expr, InvalidDSL) {
using namespace milvus;
using namespace milvus::query;
using namespace milvus::segcore;
std::string dsl_string = R"(
{
"float": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
std::string dsl_string = R"({
"float": {
"must": [
{
"range": {
"age": {
"GT": 1,
"LT": 100
}
}
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_FLOAT, 16, MetricType::METRIC_L2);
......@@ -267,33 +264,32 @@ TEST(Expr, TestRange) {
{R"("NE": 2000)", [](int v) { return v != 2000; }},
};
std::string dsl_string_tmp = R"(
{
"bool": {
"must": [
{
"range": {
"age": {
@@@@
std::string dsl_string_tmp = R"({
"bool": {
"must": [
{
"range": {
"age": {
@@@@
}
}
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_FLOAT, 16, MetricType::METRIC_L2);
schema->AddDebugField("age", DataType::INT32);
......@@ -350,33 +346,32 @@ TEST(Expr, TestTerm) {
{vec_2k_3k, [](int v) { return 2000 <= v && v < 3000; }},
};
std::string dsl_string_tmp = R"(
{
"bool": {
"must": [
{
"term": {
"age": {
"values": @@@@
std::string dsl_string_tmp = R"({
"bool": {
"must": [
{
"term": {
"age": {
"values": @@@@
}
}
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_FLOAT, 16, MetricType::METRIC_L2);
schema->AddDebugField("age", DataType::INT32);
......@@ -417,8 +412,7 @@ TEST(Expr, TestSimpleDsl) {
using namespace milvus::query;
using namespace milvus::segcore;
auto vec_dsl = Json::parse(R"(
{
auto vec_dsl = Json::parse(R"({
"vector": {
"fakevec": {
"metric_type": "L2",
......@@ -430,8 +424,7 @@ TEST(Expr, TestSimpleDsl) {
"round_decimal": 3
}
}
}
)");
})");
int N = 32;
auto get_item = [&](int base, int bit = 1) {
......@@ -522,34 +515,33 @@ TEST(Expr, TestCompare) {
{R"("EQ")", [](int a, int64_t b) { return a == b; }}, {R"("NE")", [](int a, int64_t b) { return a != b; }},
};
std::string dsl_string_tpl = R"(
{
"bool": {
"must": [
{
"compare": {
%1%: [
"age1",
"age2"
]
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
std::string dsl_string_tpl = R"({
"bool": {
"must": [
{
"compare": {
%1%: [
"age1",
"age2"
]
}
},
{
"vector": {
"fakevec": {
"metric_type": "L2",
"params": {
"nprobe": 10
},
"query": "$0",
"topk": 10,
"round_decimal": 3
}
}
}
}
]
}
})";
]
}
})";
auto schema = std::make_shared<Schema>();
schema->AddDebugField("fakevec", DataType::VECTOR_FLOAT, 16, MetricType::METRIC_L2);
schema->AddDebugField("age1", DataType::INT32);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或