diff --git a/lib/mapping.c b/lib/mapping.c index 5646699fd..aa4a10609 100644 --- a/lib/mapping.c +++ b/lib/mapping.c @@ -28,7 +28,7 @@ #include "list.h" #include "utils.h" -int mapping_entry_parse_str(struct mapping_entry *e, const char *str, struct list *nodes) +int mapping_parse_str(struct mapping_entry *e, const char *str, struct list *nodes) { int id; char *cpy, *node, *type, *field, *subfield, *end; @@ -184,7 +184,7 @@ int mapping_parse(struct mapping_entry *e, json_t *j, struct list *nodes) if (!str) return -1; - return mapping_entry_parse_str(e, str, nodes); + return mapping_parse_str(e, str, nodes); } int mapping_remap(struct list *m, struct sample *original, struct sample *remapped, struct stats *s) diff --git a/tests/unit/mapping.c b/tests/unit/mapping.c index 899de8c55..d4c7ea985 100644 --- a/tests/unit/mapping.c +++ b/tests/unit/mapping.c @@ -42,27 +42,27 @@ Test(mapping, parse_nodes) list_push(&n, &n2); list_push(&n, &n3); - ret = mapping_entry_parse_str(&m, "apple.ts.origin", &n); + ret = mapping_parse_str(&m, "apple.ts.origin", &n); cr_assert_eq(ret, 0); cr_assert_eq(m.node, &n1); - cr_assert_eq(m.type, MAPPING_TYPE_TIMESTAMP); - cr_assert_eq(m.timestamp.id, MAPPING_TIMESTAMP_ORIGIN); + cr_assert_eq(m.type, MAPPING_TYPE_TS); + cr_assert_eq(m.ts.id, MAPPING_TS_ORIGIN); - ret = mapping_entry_parse_str(&m, "cherry.stats.owd.mean", &n); + ret = mapping_parse_str(&m, "cherry.stats.owd.mean", &n); cr_assert_eq(ret, 0); cr_assert_eq(m.node, &n2); cr_assert_eq(m.type, MAPPING_TYPE_STATS); cr_assert_eq(m.stats.id, STATS_OWD); cr_assert_eq(m.stats.type, MAPPING_STATS_TYPE_MEAN); - ret = mapping_entry_parse_str(&m, "carrot.data[1-2]", &n); + ret = mapping_parse_str(&m, "carrot.data[1-2]", &n); cr_assert_eq(ret, 0); cr_assert_eq(m.node, &n3); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 1); cr_assert_eq(m.length, 2); - ret = mapping_entry_parse_str(&m, "carrot", &n); + ret = mapping_parse_str(&m, "carrot", &n); cr_assert_eq(ret, 0); cr_assert_eq(m.node, &n3); cr_assert_eq(m.type, MAPPING_TYPE_DATA); @@ -78,74 +78,74 @@ Test(mapping, parse) int ret; struct mapping_entry m; - ret = mapping_entry_parse_str(&m, "ts.origin", NULL); + ret = mapping_parse_str(&m, "ts.origin", NULL); cr_assert_eq(ret, 0); - cr_assert_eq(m.type, MAPPING_TYPE_TIMESTAMP); - cr_assert_eq(m.timestamp.id, MAPPING_TIMESTAMP_ORIGIN); + cr_assert_eq(m.type, MAPPING_TYPE_TS); + cr_assert_eq(m.ts.id, MAPPING_TS_ORIGIN); - ret = mapping_entry_parse_str(&m, "hdr.sequence", NULL); + ret = mapping_parse_str(&m, "hdr.sequence", NULL); cr_assert_eq(ret, 0); - cr_assert_eq(m.type, MAPPING_TYPE_HEADER); - cr_assert_eq(m.header.id, MAPPING_HEADER_SEQUENCE); + cr_assert_eq(m.type, MAPPING_TYPE_HDR); + cr_assert_eq(m.hdr.id, MAPPING_HDR_SEQUENCE); - ret = mapping_entry_parse_str(&m, "stats.owd.mean", NULL); + ret = mapping_parse_str(&m, "stats.owd.mean", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_STATS); cr_assert_eq(m.stats.id, STATS_OWD); cr_assert_eq(m.stats.type, MAPPING_STATS_TYPE_MEAN); - ret = mapping_entry_parse_str(&m, "data[1-2]", NULL); + ret = mapping_parse_str(&m, "data[1-2]", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 1); cr_assert_eq(m.length, 2); - ret = mapping_entry_parse_str(&m, "data[5-5]", NULL); + ret = mapping_parse_str(&m, "data[5-5]", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 5); cr_assert_eq(m.length, 1); - ret = mapping_entry_parse_str(&m, "data[22]", NULL); + ret = mapping_parse_str(&m, "data[22]", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 22); cr_assert_eq(m.length, 1); - ret = mapping_entry_parse_str(&m, "data", NULL); + ret = mapping_parse_str(&m, "data", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 0); cr_assert_eq(m.length, 0); - ret = mapping_entry_parse_str(&m, "data[]", NULL); + ret = mapping_parse_str(&m, "data[]", NULL); cr_assert_eq(ret, 0); cr_assert_eq(m.type, MAPPING_TYPE_DATA); cr_assert_eq(m.data.offset, 0); cr_assert_eq(m.length, 0); - ret = mapping_entry_parse_str(&m, "data[1.1-2f]", NULL); + ret = mapping_parse_str(&m, "data[1.1-2f]", NULL); cr_assert_neq(ret, 0); /* Missing parts */ - ret = mapping_entry_parse_str(&m, "stats.owd", NULL); + ret = mapping_parse_str(&m, "stats.owd", NULL); cr_assert_neq(ret, 0); /* This a type */ - ret = mapping_entry_parse_str(&m, "hdr.sequences", NULL); + ret = mapping_parse_str(&m, "hdr.sequences", NULL); cr_assert_neq(ret, 0); /* Check for superfluous chars at the end */ - ret = mapping_entry_parse_str(&m, "stats.ts.origin.bla", NULL); + ret = mapping_parse_str(&m, "stats.ts.origin.bla", NULL); cr_assert_neq(ret, 0); - ret = mapping_entry_parse_str(&m, "stats.ts.origin.", NULL); + ret = mapping_parse_str(&m, "stats.ts.origin.", NULL); cr_assert_neq(ret, 0); - ret = mapping_entry_parse_str(&m, "data[1-2]bla", NULL); + ret = mapping_parse_str(&m, "data[1-2]bla", NULL); cr_assert_neq(ret, 0); /* Negative length of chunk */ - ret = mapping_entry_parse_str(&m, "data[5-3]", NULL); + ret = mapping_parse_str(&m, "data[5-3]", NULL); cr_assert_eq(ret, -1); } \ No newline at end of file