gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH]rename group2group column name

Browse Source
This commit is contained in:
liuwentan
2023-12-26 18:31:25 +08:00
parent 3d0d410ac7
commit 5f703bb4f4
10 changed files with 300 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/file_test_tableinfo.conf
View File

@@ -40,9 +40,9 @@
"table_type":"group2group",
"valid_column":4,
"custom": {
"incl_group_ids":1,
"super_group_id":2,
"excl_group_ids":3
"group_id":1,
"included_sub_group_ids":2,
"excluded_sub_group_ids":3
}
},
{

54
test/group_exclude/group_exclude_L3.conf
View File

@@ -1,51 +1,51 @@
{
"add_items": [
{
"incl_group_ids": "8",
"super_group_id": 5,
"excl_group_ids": "9"
"group_id": 5,
"included_sub_group_ids": "8",
"excluded_sub_group_ids": "9"
},
{
"incl_group_ids": "6,9",
"super_group_id": 1,
"excl_group_ids": "5"
"group_id": 1,
"included_sub_group_ids": "6,9",
"excluded_sub_group_ids": "5"
},
{
"incl_group_ids": "10,11",
"super_group_id": 6,
"excl_group_ids": "7"
"group_id": 6,
"included_sub_group_ids": "10,11",
"excluded_sub_group_ids": "7"
},
{
"incl_group_ids": "11,12",
"super_group_id": 7,
"excl_group_ids": "10"
"group_id": 7,
"included_sub_group_ids": "11,12",
"excluded_sub_group_ids": "10"
},
{
"incl_group_ids": "7",
"super_group_id": 2,
"excl_group_ids": "6"
"group_id": 2,
"included_sub_group_ids": "7",
"excluded_sub_group_ids": "6"
},
{
"incl_group_ids": "7",
"super_group_id": 4,
"excl_group_ids": "13"
"group_id": 4,
"included_sub_group_ids": "7",
"excluded_sub_group_ids": "13"
},
{
"incl_group_ids": "13",
"super_group_id": 3,
"excl_group_ids": "6"
"group_id": 3,
"included_sub_group_ids": "13",
"excluded_sub_group_ids": "6"
}
],
"del_items": [
{
"incl_group_ids": "null",
"super_group_id": 6,
"excl_group_ids": "7"
"group_id": 6,
"included_sub_group_ids": "null",
"excluded_sub_group_ids": "7"
},
{
"incl_group_ids": "null",
"super_group_id": 4,
"excl_group_ids": "13"
"group_id": 4,
"included_sub_group_ids": "null",
"excluded_sub_group_ids": "13"
}
]
}

84
test/group_exclude/group_exclude_L4.conf
View File

@@ -1,76 +1,76 @@
{
"add_items": [
{
"incl_group_ids": "14",
"super_group_id": 8,
"excl_group_ids": "15"
"group_id": 8,
"included_sub_group_ids": "14",
"excluded_sub_group_ids": "15"
},
{
"incl_group_ids": "14,16",
"super_group_id": 9,
"excl_group_ids": "null"
"group_id": 9,
"included_sub_group_ids": "14,16",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "8",
"super_group_id": 5,
"excl_group_ids": "9"
"group_id": 5,
"included_sub_group_ids": "8",
"excluded_sub_group_ids": "9"
},
{
"incl_group_ids": "6,9",
"super_group_id": 1,
"excl_group_ids": "5"
"group_id": 1,
"included_sub_group_ids": "6,9",
"excluded_sub_group_ids": "5"
},
{
"incl_group_ids": "16",
"super_group_id": 10,
"excl_group_ids": "null"
"group_id": 10,
"included_sub_group_ids": "16",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "10,12",
"super_group_id": 7,
"excl_group_ids": "null"
"group_id": 7,
"included_sub_group_ids": "10,12",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "7,11",
"super_group_id": 6,
"excl_group_ids": "10"
"group_id": 6,
"included_sub_group_ids": "7,11",
"excluded_sub_group_ids": "10"
},
{
"incl_group_ids": "17",
"super_group_id": 11,
"excl_group_ids": "null"
"group_id": 11,
"included_sub_group_ids": "17",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "17",
"super_group_id": 12,
"excl_group_ids": "null"
"group_id": 12,
"included_sub_group_ids": "17",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "17",
"super_group_id":13,
"excl_group_ids": "18"
"group_id":13,
"included_sub_group_ids": "17",
"excluded_sub_group_ids": "18"
},
{
"incl_group_ids": "7",
"super_group_id": 2,
"excl_group_ids": "6"
"group_id": 2,
"included_sub_group_ids": "7",
"excluded_sub_group_ids": "6"
},
{
"incl_group_ids": "7",
"super_group_id": 4,
"excl_group_ids": "13"
"group_id": 4,
"included_sub_group_ids": "7",
"excluded_sub_group_ids": "13"
},
{
"incl_group_ids": "13",
"super_group_id": 3,
"excl_group_ids": "6"
"group_id": 3,
"included_sub_group_ids": "13",
"excluded_sub_group_ids": "6"
}
],
"del_items": [
{
"incl_group_ids": "null",
"super_group_id": 6,
"excl_group_ids": "10"
"group_id": 6,
"included_sub_group_ids": "null",
"excluded_sub_group_ids": "10"
}
]
}

60
test/group_exclude/group_exclude_exceed.conf
View File

@@ -1,56 +1,56 @@
{
"add_items": [
{
"incl_group_ids": "6",
"super_group_id": 3,
"excl_group_ids": "7"
"group_id": 3,
"included_sub_group_ids": "6",
"excluded_sub_group_ids": "7"
},
{
"incl_group_ids": "3,7",
"super_group_id": 1,
"excl_group_ids": "4"
"group_id": 1,
"included_sub_group_ids": "3,7",
"excluded_sub_group_ids": "4"
},
{
"incl_group_ids": "13",
"super_group_id": 10,
"excl_group_ids": "null"
"group_id": 10,
"included_sub_group_ids": "13",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "10",
"super_group_id": 11,
"excl_group_ids": "null"
"group_id": 11,
"included_sub_group_ids": "10",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "11",
"super_group_id": 8,
"excl_group_ids": "null"
"group_id": 8,
"included_sub_group_ids": "11",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "8",
"super_group_id": 5,
"excl_group_ids": "null"
"group_id": 5,
"included_sub_group_ids": "8",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "5",
"super_group_id": 4,
"excl_group_ids": "null"
"group_id": 4,
"included_sub_group_ids": "5",
"excluded_sub_group_ids": "null"
},
{
"incl_group_ids": "5",
"super_group_id": 12,
"excl_group_ids": "2"
"group_id": 12,
"included_sub_group_ids": "5",
"excluded_sub_group_ids": "2"
},
{
"incl_group_ids": "4",
"super_group_id": 2,
"excl_group_ids": "null"
"group_id": 2,
"included_sub_group_ids": "4",
"excluded_sub_group_ids": "null"
}
],
"del_items": [
{
"incl_group_ids": "13",
"super_group_id": 10,
"excl_group_ids": "null"
"group_id": 10,
"included_sub_group_ids": "13",
"excluded_sub_group_ids": "null"
}
]
}

90
test/group_exclude/group_exclude_gtest.cpp
View File

@@ -19,9 +19,9 @@ const char *table_info_path = "./group_exclude_table_info.conf";
const char *log_file = "./group_exclude_gtest.log";
struct group_item {
char incl_ids_str[MAX_IDS_STR_LEN];
char excl_ids_str[MAX_IDS_STR_LEN];
long long super_group_id;
long long group_id;
char incl_sub_ids_str[MAX_IDS_STR_LEN];
char excl_sub_ids_str[MAX_IDS_STR_LEN];
};
struct group2group_rule {
@@ -63,20 +63,20 @@ static int parse_config_file(const char *filename, struct group2group_rule *rule
rule_cnt = cJSON_GetArraySize(items_array);
for (size_t i = 0; i < rule_cnt; i++) {
cJSON *item_obj = cJSON_GetArrayItem(items_array, i);
cJSON *tmp_item = cJSON_GetObjectItem(item_obj, "incl_group_ids");
cJSON *tmp_item = cJSON_GetObjectItem(item_obj, "group_id");
if (tmp_item != NULL && tmp_item->type == cJSON_Number) {
rules->add_items[i].group_id = tmp_item->valueint;
}
tmp_item = cJSON_GetObjectItem(item_obj, "included_sub_group_ids");
if (tmp_item != NULL && tmp_item->type == cJSON_String) {
memcpy(rules->add_items[i].incl_ids_str, tmp_item->valuestring,
memcpy(rules->add_items[i].incl_sub_ids_str, tmp_item->valuestring,
strlen(tmp_item->valuestring));
}
tmp_item = cJSON_GetObjectItem(item_obj, "super_group_id");
if (tmp_item != NULL && tmp_item->type == cJSON_Number) {
rules->add_items[i].super_group_id = tmp_item->valueint;
}
tmp_item = cJSON_GetObjectItem(item_obj, "excl_group_ids");
tmp_item = cJSON_GetObjectItem(item_obj, "excluded_sub_group_ids");
if (tmp_item != NULL && tmp_item->type == cJSON_String) {
memcpy(rules->add_items[i].excl_ids_str, tmp_item->valuestring,
memcpy(rules->add_items[i].excl_sub_ids_str, tmp_item->valuestring,
strlen(tmp_item->valuestring));
}
}
@@ -92,20 +92,20 @@ static int parse_config_file(const char *filename, struct group2group_rule *rule
rule_cnt = cJSON_GetArraySize(items_array);
for (size_t i = 0; i < rule_cnt; i++) {
cJSON *item_obj = cJSON_GetArrayItem(items_array, i);
cJSON *tmp_item = cJSON_GetObjectItem(item_obj, "incl_group_ids");
cJSON *tmp_item = cJSON_GetObjectItem(item_obj, "group_id");
if (tmp_item != NULL && tmp_item->type == cJSON_Number) {
rules->del_items[i].group_id = tmp_item->valueint;
}
tmp_item = cJSON_GetObjectItem(item_obj, "included_sub_group_ids");
if (tmp_item != NULL && tmp_item->type == cJSON_String) {
memcpy(rules->del_items[i].incl_ids_str, tmp_item->valuestring,
memcpy(rules->del_items[i].incl_sub_ids_str, tmp_item->valuestring,
strlen(tmp_item->valuestring));
}
tmp_item = cJSON_GetObjectItem(item_obj, "super_group_id");
if (tmp_item != NULL && tmp_item->type == cJSON_Number) {
rules->del_items[i].super_group_id = tmp_item->valueint;
}
tmp_item = cJSON_GetObjectItem(item_obj, "excl_group_ids");
tmp_item = cJSON_GetObjectItem(item_obj, "excluded_sub_group_ids");
if (tmp_item != NULL && tmp_item->type == cJSON_String) {
memcpy(rules->del_items[i].excl_ids_str, tmp_item->valuestring,
memcpy(rules->del_items[i].excl_sub_ids_str, tmp_item->valuestring,
strlen(tmp_item->valuestring));
}
}
@@ -182,8 +182,8 @@ TEST_F(MaatGroupExclude, level_3_function) {
for (size_t i = 0; i < rules.n_add_item; i++) {
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.add_items[i].incl_ids_str,
rules.add_items[i].super_group_id, rules.add_items[i].excl_ids_str, 1);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.add_items[i].group_id,
rules.add_items[i].incl_sub_ids_str, rules.add_items[i].excl_sub_ids_str, 1);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
}
@@ -199,8 +199,8 @@ TEST_F(MaatGroupExclude, level_3_function) {
//delete group_id = 7, super_group_id = 6, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[0].incl_ids_str,
rules.del_items[0].super_group_id, rules.del_items[0].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[0].group_id,
rules.del_items[0].incl_sub_ids_str, rules.del_items[0].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 2);
@@ -213,8 +213,8 @@ TEST_F(MaatGroupExclude, level_3_function) {
//delete group_id = 13, super_group_id = 4, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[1].incl_ids_str,
rules.del_items[1].super_group_id, rules.del_items[1].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[1].group_id,
rules.del_items[1].incl_sub_ids_str, rules.del_items[1].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 3);
@@ -247,8 +247,8 @@ TEST_F(MaatGroupExclude, level_3_perf) {
for (size_t i = 0; i < rules.n_add_item; i++) {
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.add_items[i].incl_ids_str,
rules.add_items[i].super_group_id, rules.add_items[i].excl_ids_str, 1);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.add_items[i].group_id,
rules.add_items[i].incl_sub_ids_str, rules.add_items[i].excl_sub_ids_str, 1);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
}
@@ -271,8 +271,8 @@ TEST_F(MaatGroupExclude, level_3_perf) {
//delete group_id = 7, super_group_id = 6, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[0].incl_ids_str,
rules.del_items[0].super_group_id, rules.del_items[0].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[0].group_id,
rules.del_items[0].incl_sub_ids_str, rules.del_items[0].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 5);
@@ -288,8 +288,8 @@ TEST_F(MaatGroupExclude, level_3_perf) {
//delete group_id = 13, super_group_id = 4, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[1].incl_ids_str,
rules.del_items[1].super_group_id, rules.del_items[1].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[1].group_id,
rules.del_items[1].incl_sub_ids_str, rules.del_items[1].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 6);
@@ -324,8 +324,8 @@ TEST_F(MaatGroupExclude, level_4_function) {
for (size_t i = 0; i < rules.n_add_item; i++) {
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.add_items[i].incl_ids_str,
rules.add_items[i].super_group_id, rules.add_items[i].excl_ids_str, 1);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.add_items[i].group_id,
rules.add_items[i].incl_sub_ids_str, rules.add_items[i].excl_sub_ids_str, 1);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
}
@@ -344,8 +344,8 @@ TEST_F(MaatGroupExclude, level_4_function) {
//delete group_id = 10, super_group_id = 6, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[0].incl_ids_str,
rules.del_items[0].super_group_id, rules.del_items[0].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[0].group_id,
rules.del_items[0].incl_sub_ids_str, rules.del_items[0].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 8);
@@ -381,8 +381,8 @@ TEST_F(MaatGroupExclude, level_4_perf) {
for (size_t i = 0; i < rules.n_add_item; i++) {
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.add_items[i].incl_ids_str,
rules.add_items[i].super_group_id, rules.add_items[i].excl_ids_str, 1);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.add_items[i].group_id,
rules.add_items[i].incl_sub_ids_str, rules.add_items[i].excl_sub_ids_str, 1);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
}
@@ -405,8 +405,8 @@ TEST_F(MaatGroupExclude, level_4_perf) {
//delete group_id = 10, super_group_id = 6, is_exclude = 1
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[0].incl_ids_str,
rules.del_items[0].super_group_id, rules.del_items[0].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[0].group_id,
rules.del_items[0].incl_sub_ids_str, rules.del_items[0].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 8);
@@ -441,8 +441,8 @@ TEST_F(MaatGroupExclude, level_exceed_function) {
for (size_t i = 0; i < rules.n_add_item; i++) {
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.add_items[i].incl_ids_str,
rules.add_items[i].super_group_id, rules.add_items[i].excl_ids_str, 1);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.add_items[i].group_id,
rules.add_items[i].incl_sub_ids_str, rules.add_items[i].excl_sub_ids_str, 1);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
}
@@ -462,8 +462,8 @@ TEST_F(MaatGroupExclude, level_exceed_function) {
//delete group_id = 13, super_group_id = 10, is_exclude = 0
memset(table_line, 0, sizeof(table_line));
sprintf(table_line, "%s\t%lld\t%s\t%d", rules.del_items[0].incl_ids_str,
rules.del_items[0].super_group_id, rules.del_items[0].excl_ids_str, 0);
sprintf(table_line, "%lld\t%s\t%s\t%d", rules.del_items[0].group_id,
rules.del_items[0].incl_sub_ids_str, rules.del_items[0].excl_sub_ids_str, 0);
group2group_runtime_update(g2g_runtime, g2g_schema, table_name, table_line, 4);
group2group_runtime_commit(g2g_runtime, table_name, 9);

8
test/group_exclude/group_exclude_table_info.conf
View File

@@ -3,9 +3,9 @@
"table_name":"EXCLUDE_GROUP2GROUP",
"table_type":"group2group",
"valid_column":4,
"custom": {
"incl_group_ids":1,
"super_group_id":2,
"excl_group_ids":3
"custom": {
"group_id":1,
"included_sub_group_ids":2,
"excluded_sub_group_ids":3
}
}

29
test/maat_framework_gtest.cpp
View File

@@ -187,15 +187,14 @@ int group2compile_table_set_line(struct maat *maat_inst, const char *table_name,
int group2group_table_set_line(struct maat *maat_inst, const char *table_name,
enum maat_operation op, long long group_id,
long long superior_group_id, int is_exclude,
int expire_after)
long long sub_group_id, int expire_after)
{
char table_line[128] = {0};
sprintf(table_line, "%lld\t%lld\t%d\t%d", group_id, superior_group_id,
is_exclude, op);
sprintf(table_line, "%lld\t%lld\t%s\t%d", group_id, sub_group_id,
"null", op);
struct maat_cmd_line line_rule;
line_rule.rule_id = TO_GROUP2X_KEY(group_id, superior_group_id, 0);
line_rule.rule_id = TO_GROUP2X_KEY(group_id, sub_group_id, 0);
line_rule.table_line = table_line;
line_rule.table_name = table_name;
line_rule.expire_after = expire_after;
@@ -7746,7 +7745,7 @@ TEST_F(MaatCmdTest, SubGroup) {
//group2 -> group1 -> compile1
long long group2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group2_id, group1_id, 0, 0);
group1_id, group2_id, 0);
EXPECT_EQ(ret, 1);
/* item1 -> group2 -> group1 -> compile1
@@ -7830,7 +7829,7 @@ TEST_F(MaatCmdTest, SubGroup) {
*/
long long group3_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group3_id, group1_id, 0, 0);
group1_id, group3_id, 0);
EXPECT_EQ(ret, 1);
long long item2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_REGION", 1);
@@ -8927,7 +8926,7 @@ TEST_F(MaatCmdTest, HitGroup) {
*/
long long group2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group2_id, group21_id, 0, 0);
group21_id, group2_id, 0);
EXPECT_EQ(ret, 1);
/* item1 -> group1 -> compile1
@@ -8949,7 +8948,7 @@ TEST_F(MaatCmdTest, HitGroup) {
*/
long long group11_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group1_id, group11_id, 0, 0);
group11_id, group1_id, 0);
EXPECT_EQ(ret, 1);
//item3 -> group3, group3 is not referenced by any compile.
@@ -9196,7 +9195,7 @@ TEST_F(MaatCmdTest, HitPathBasic) {
*/
long long group2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group2_id, group21_id, 0, 0);
group21_id, group2_id, 0);
EXPECT_EQ(ret, 1);
/* item1 -> group1 -> compile1
@@ -9218,7 +9217,7 @@ TEST_F(MaatCmdTest, HitPathBasic) {
*/
long long group11_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group1_id, group11_id, 0, 0);
group11_id, group1_id, 0);
EXPECT_EQ(ret, 1);
//item3 -> group3, group3 is not referenced by any compile.
@@ -9498,7 +9497,7 @@ TEST_F(MaatCmdTest, HitPathAdvanced) {
*/
long long group2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group2_id, group21_id, 0, 0);
group21_id, group2_id, 0);
EXPECT_EQ(ret, 1);
/* item1 -> group1 -> compile1
@@ -9860,7 +9859,7 @@ TEST_F(MaatCmdTest, HitPathHasNotGroup) {
*/
long long group2_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group2_id, group21_id, 0, 0);
group21_id, group2_id, 0);
EXPECT_EQ(ret, 1);
/* !(item1 -> group1) -> compile1
@@ -9882,7 +9881,7 @@ TEST_F(MaatCmdTest, HitPathHasNotGroup) {
*/
long long group11_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group1_id, group11_id, 0, 0);
group11_id, group1_id, 0);
EXPECT_EQ(ret, 1);
//item3 -> group3, group3 is not referenced by any compile.
@@ -10132,7 +10131,7 @@ TEST_F(MaatCmdTest, SameSuperGroupRefByMultiCompile) {
long long group52_id = maat_cmd_incrby(maat_inst, "SEQUENCE_GROUP", 1);
ret = group2group_table_set_line(maat_inst, g2g_table_name, MAAT_OP_ADD,
group5_id, group52_id, 0, 0);
group52_id, group5_id, 0);
EXPECT_EQ(ret, 1);
long long compile2_id = maat_cmd_incrby(maat_inst, "TEST_SEQ", 1);

6
test/table_info.conf
View File

@@ -95,9 +95,9 @@
"table_type":"group2group",
"valid_column":4,
"custom": {
"incl_group_ids":1,
"super_group_id":2,
"excl_group_ids":3
"group_id":1,
"included_sub_group_ids":2,
"excluded_sub_group_ids":3
}
},
{