rrdlabels: allow uppercase A-Z in label name (#18013)
Ilya Mashchenko committed
Jun 26, 2024 at 16:04 UTC
2bad58ba6ef4bf23ea992c630c5b5bc7e6cc804b
1 file changed
+6
-32
src/database/rrdlabels.c
+6
-32
@@ -412,32 +412,6 @@ __attribute__((constructor)) void initialize_labels_keys_char_map(void) {
412
label_names_char_map[i] = label_values_char_map[i];
413
414
// apply overrides to the label names map
415
- label_names_char_map['A'] = 'a';
416
- label_names_char_map['B'] = 'b';
417
- label_names_char_map['C'] = 'c';
418
- label_names_char_map['D'] = 'd';
419
- label_names_char_map['E'] = 'e';
420
- label_names_char_map['F'] = 'f';
421
- label_names_char_map['G'] = 'g';
422
- label_names_char_map['H'] = 'h';
423
- label_names_char_map['I'] = 'i';
424
- label_names_char_map['J'] = 'j';
425
- label_names_char_map['K'] = 'k';
426
- label_names_char_map['L'] = 'l';
427
- label_names_char_map['M'] = 'm';
428
- label_names_char_map['N'] = 'n';
429
- label_names_char_map['O'] = 'o';
430
- label_names_char_map['P'] = 'p';
431
- label_names_char_map['Q'] = 'q';
432
- label_names_char_map['R'] = 'r';
433
- label_names_char_map['S'] = 's';
434
- label_names_char_map['T'] = 't';
435
- label_names_char_map['U'] = 'u';
436
- label_names_char_map['V'] = 'v';
437
- label_names_char_map['W'] = 'w';
438
- label_names_char_map['X'] = 'x';
439
- label_names_char_map['Y'] = 'y';
440
- label_names_char_map['Z'] = 'z';
415
label_names_char_map['='] = '_';
416
label_names_char_map[':'] = '_';
417
label_names_char_map['+'] = '_';
@@ -1652,13 +1626,13 @@ static int rrdlabels_unittest_add_pairs() {
1626
errors += rrdlabels_unittest_add_a_pair("\"tag=1\": country:\"Gre\\\"ece\"", "tag_1", "country:Gre_ece");
1627
errors += rrdlabels_unittest_add_a_pair("\"tag=1\" = country:\"Gre\\\"ece\"", "tag_1", "country:Gre_ece");
1628
1655
- errors += rrdlabels_unittest_add_a_pair("\t'LABE=L'\t=\t\"World\" peace", "labe_l", "World peace");
1656
- errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry:\"World\":\"Europe\":\"Greece\"", "la_b_el", "country:World:Europe:Greece");
1657
- errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry\\\"World\"\\\"Europe\"\\\"Greece\"", "la_b_el", "country/World/Europe/Greece");
1629
+ errors += rrdlabels_unittest_add_a_pair("\t'LABE=L'\t=\t\"World\" peace", "LABE_L", "World peace");
1630
+ errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry:\"World\":\"Europe\":\"Greece\"", "LA_B_EL", "country:World:Europe:Greece");
1631
+ errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry\\\"World\"\\\"Europe\"\\\"Greece\"", "LA_B_EL", "country/World/Europe/Greece");
1632
1659
- errors += rrdlabels_unittest_add_a_pair("NAME=\"VALUE\"", "name", "VALUE");
1660
- errors += rrdlabels_unittest_add_a_pair("\"NAME\" : \"VALUE\"", "name", "VALUE");
1661
- errors += rrdlabels_unittest_add_a_pair("NAME: \"VALUE\"", "name", "VALUE");
1633
+ errors += rrdlabels_unittest_add_a_pair("NAME=\"VALUE\"", "NAME", "VALUE");
1634
+ errors += rrdlabels_unittest_add_a_pair("\"NAME\" : \"VALUE\"", "NAME", "VALUE");
1635
+ errors += rrdlabels_unittest_add_a_pair("NAME: \"VALUE\"", "NAME", "VALUE");
1636
1637
return errors;
1638
}