Skip to content

Commit 681778d

Browse files
HugoGGuerrierHugoGGuerrier
committed
Merge branch 'topic/kp/sort_kp_json' into 'master'
Sort KP by ids during kp.json generation See merge request eng/libadalang/langkit-query-language!404
2 parents 096ff2e + f812af1 commit 681778d

File tree

2 files changed

+83
-83
lines changed

2 files changed

+83
-83
lines changed

‎lkql_checker/share/lkql/kp/kp.json

Lines changed: 80 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,98 @@
11
{
22
"impacts": {
3-
"kp_19423": "22.*,23.*,24.*",
4-
"kp_19341": "24.*",
3+
"kp_18614": "20.*,21.*,22.*,23.*",
4+
"kp_18636": "22.*,23.*",
5+
"kp_18637": "23.*",
6+
"kp_18701": "23.*",
7+
"kp_18718": "23.*",
8+
"kp_18801": "23.*",
9+
"kp_18926": "23.*,24.1",
10+
"kp_19038": "24.1",
11+
"kp_19134": "23.*,24.*",
12+
"kp_19142": "24.*",
13+
"kp_19159": "23.*,24.*",
14+
"kp_19198": "19.1,19.2,19.3,19.4,19.5,19.6,19.7,19.8,20.*,21.*,22.*,23.*,24.1",
515
"kp_19237": "23.*,24.1",
16+
"kp_19279": "23.*,24.*",
17+
"kp_19312": "24.*",
18+
"kp_19341": "24.*",
19+
"kp_19423": "22.*,23.*,24.*",
620
"kp_19447": "24.*",
721
"kp_19501": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.*,19.*,20.*,21.*,22.*,23.*,24.*",
8-
"kp_19142": "24.*",
9-
"kp_19312": "24.*",
1022
"kp_19529": "24.*",
11-
"kp_19134": "23.*,24.*",
12-
"kp_19279": "23.*,24.*",
13-
"kp_19038": "24.1",
14-
"kp_19159": "23.*,24.*",
15-
"kp_19198": "19.1,19.2,19.3,19.4,19.5,19.6,19.7,19.8,20.*,21.*,22.*,23.*,24.1",
16-
"kp_va03_035": "22.*",
17-
"kp_u923_018": "21.*",
18-
"kp_v329_046": "22.1",
19-
"kp_18701": "23.*",
20-
"kp_ua12_036": "21.*,22.*",
21-
"kp_vb20_002": "22.*",
22-
"kp_18637": "23.*",
23+
"kp_19696": "24.*,25.*",
24+
"kp_ob03_009": "19.*",
25+
"kp_p226_024": "7.1.*,7.2.*,7.3.*,7.4.1,7.4.2,7.4.3",
26+
"kp_q309_014": "7.1.*,7.2.*,7.3.*,7.4.*,17.*",
27+
"kp_q609_033": "7.1.*,7.2.*,7.3.*,7.4.*",
28+
"kp_qc02_001": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2",
29+
"kp_r316_001": "18.*,19.1,19.2,19.3,19.4,20.1,20.2",
30+
"kp_r410_028": "7.1.*,7.2.*,7.3.*",
31+
"kp_r511_017": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.*",
32+
"kp_r517_023": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2",
33+
"kp_s114_015": "18.*,19.*",
34+
"kp_s124_035": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.*,19.*",
35+
"kp_s521_014": "19.*",
36+
"kp_s621_051": "19.*",
37+
"kp_s722_023": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2,19.1,19.2,19.3",
38+
"kp_s724_042": "19.*,20.1",
39+
"kp_s814_034": "17.*,18.*,19.*",
40+
"kp_t420_033": "18.*,19.*,20.1",
41+
"kp_t528_043": "18.*,19.1,19.2,19.3,19.4,19.5,20.1,20.2",
42+
"kp_t602_028": "20.*",
43+
"kp_t708_064": "20.1,20.2",
44+
"kp_t805_037": "20.1,20.2",
45+
"kp_ta10_002": "21.*,22.*,23.1",
46+
"kp_ta15_022": "18.1,18.2,18.3,19.1,19.2,19.3,19.4,19.5,19.6,20.1,20.2",
47+
"kp_ta30_032": "20.1,20.2",
48+
"kp_tb09_038": "20.1,20.2",
49+
"kp_tb23_035": "20.1,20.2",
50+
"kp_tb25_028": "20.*",
51+
"kp_tc01_050": "19.1,19.2,19.3,19.4,20.1,20.2,21.1",
52+
"kp_u126_006": "20.1,20.2,21.1",
53+
"kp_u225_018": "20.1,20.2,21.1,21.2,21.3",
54+
"kp_u310_012": "22.*",
55+
"kp_u316_028": "20.1,20.2,21.1",
56+
"kp_u629_002": "21.*",
57+
"kp_u630_012": "21.*",
58+
"kp_u701_015": "21.*,22.*",
59+
"kp_u702_038": "21.*",
2360
"kp_u727_033": "7.4.*,17.*,18.*,19.*,20.*,21.*",
61+
"kp_u803_030": "21.*",
2462
"kp_u812_034": "21.*",
25-
"kp_w330_020": "20.*,21.*,22.*,23.1",
26-
"kp_v907_005": "22.*",
27-
"kp_v924_001": "22.*",
28-
"kp_va06_034": "22.*",
63+
"kp_u923_018": "21.*",
64+
"kp_u928_018": "22.*,23.1",
65+
"kp_ua12_036": "21.*,22.*",
2966
"kp_ub15_001": "18.*,19.*,20.*,21.*",
30-
"kp_18718": "23.*",
3167
"kp_ub22_022": "19.*,20.*,21.*",
32-
"kp_18614": "20.*,21.*,22.*,23.*",
33-
"kp_v216_031": "21.*",
68+
"kp_uc22_009": "22.1",
69+
"kp_v114_047": "18.*,19.*,20.*,21.*,22.1",
3470
"kp_v120_015": "7.4.1,7.4.2,7.4.3,7.4.4,7.4.5,7.4.6,7.4.7,17.*",
3571
"kp_v127_049": "21.*,22.1",
36-
"kp_v302_021": "21.*,22.1",
37-
"kp_u630_012": "21.*",
38-
"kp_v719_024": "22.*",
39-
"kp_18636": "22.*,23.*",
40-
"kp_18801": "23.*",
41-
"kp_u629_002": "21.*",
42-
"kp_v505_020": "22.*",
43-
"kp_v114_047": "18.*,19.*,20.*,21.*,22.1",
44-
"kp_vb24_008": "23.1",
45-
"kp_v616_018": "22.*",
46-
"kp_uc22_009": "22.1",
47-
"kp_u928_018": "22.*,23.1",
4872
"kp_v206_001": "22.1",
49-
"kp_va18_003": "21.*,22.*",
5073
"kp_v214_016": "21.*,22.*,23.1",
74+
"kp_v216_031": "21.*",
75+
"kp_v302_021": "21.*,22.1",
76+
"kp_v329_046": "22.1",
77+
"kp_v404_040": "19.1,19.2,19.3,19.4,19.5,19.6,20.1,20.2,21.1,21.2,21.3,21.4,22.1",
5178
"kp_v407_011": "20.*,21.*,22.1",
79+
"kp_v505_020": "22.*",
80+
"kp_v616_018": "22.*",
5281
"kp_v624_025": "22.*",
53-
"kp_v720_003": "22.*",
5482
"kp_v708_029": "22.*",
55-
"kp_u702_038": "21.*",
56-
"kp_18926": "23.*,24.1",
57-
"kp_v404_040": "19.1,19.2,19.3,19.4,19.5,19.6,20.1,20.2,21.1,21.2,21.3,21.4,22.1",
5883
"kp_v712_039": "22.*",
59-
"kp_u803_030": "21.*",
60-
"kp_u701_015": "21.*,22.*",
61-
"kp_q309_014": "7.1.*,7.2.*,7.3.*,7.4.*,17.*",
62-
"kp_r517_023": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2",
63-
"kp_qc02_001": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2",
64-
"kp_r511_017": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.*",
65-
"kp_r410_028": "7.1.*,7.2.*,7.3.*",
66-
"kp_r316_001": "18.*,19.1,19.2,19.3,19.4,20.1,20.2",
67-
"kp_q609_033": "7.1.*,7.2.*,7.3.*,7.4.*",
68-
"kp_p226_024": "7.1.*,7.2.*,7.3.*,7.4.1,7.4.2,7.4.3",
69-
"kp_ob03_009": "19.*",
70-
"kp_ta30_032": "20.1,20.2",
71-
"kp_s724_042": "19.*,20.1",
72-
"kp_s521_014": "19.*",
73-
"kp_tb09_038": "20.1,20.2",
74-
"kp_s114_015": "18.*,19.*",
75-
"kp_s814_034": "17.*,18.*,19.*",
76-
"kp_ta10_002": "21.*,22.*,23.1",
77-
"kp_u310_012": "22.*",
78-
"kp_s722_023": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.1,18.2,19.1,19.2,19.3",
79-
"kp_u225_018": "20.1,20.2,21.1,21.2,21.3",
80-
"kp_t708_064": "20.1,20.2",
81-
"kp_tc01_050": "19.1,19.2,19.3,19.4,20.1,20.2,21.1",
82-
"kp_ta15_022": "18.1,18.2,18.3,19.1,19.2,19.3,19.4,19.5,19.6,20.1,20.2",
83-
"kp_t602_028": "20.*",
84-
"kp_u126_006": "20.1,20.2,21.1",
85-
"kp_t528_043": "18.*,19.1,19.2,19.3,19.4,19.5,20.1,20.2",
86-
"kp_s124_035": "7.1.*,7.2.*,7.3.*,7.4.*,17.*,18.*,19.*",
87-
"kp_t420_033": "18.*,19.*,20.1",
88-
"kp_tb23_035": "20.1,20.2",
89-
"kp_t805_037": "20.1,20.2",
90-
"kp_tb25_028": "20.*",
91-
"kp_s621_051": "19.*",
92-
"kp_u316_028": "20.1,20.2,21.1"
84+
"kp_v719_024": "22.*",
85+
"kp_v720_003": "22.*",
86+
"kp_v907_005": "22.*",
87+
"kp_v924_001": "22.*",
88+
"kp_va03_035": "22.*",
89+
"kp_va06_034": "22.*",
90+
"kp_va18_003": "21.*,22.*",
91+
"kp_vb20_002": "22.*",
92+
"kp_vb24_008": "23.1",
93+
"kp_w330_020": "20.*,21.*,22.*,23.1"
9394
},
9495
"gnat": [
95-
"7.1",
96-
"7.2",
97-
"7.3",
98-
"7.4",
9996
"17",
10097
"18",
10198
"19",
@@ -105,6 +102,10 @@
105102
"23",
106103
"24",
107104
"25",
108-
"26"
105+
"26",
106+
"7.1",
107+
"7.2",
108+
"7.3",
109+
"7.4"
109110
]
110111
}

‎utils/impact-db_impacts_gen.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import glob
1010
import json
1111
import sys
12+
from collections import OrderedDict
1213
from pathlib import Path
1314
from impactdb import db
1415

@@ -38,11 +39,9 @@ def list_impacts(issues: [str]) -> None:
3839
ids = [Path(id).stem[3:] for id in kps]
3940
list_impacts(sorted(ids))
4041

41-
impacts = {"impacts": res}
42-
impacts.update({"gnat": list(db.config["gnat"].keys())})
42+
impacts = {"impacts": OrderedDict(sorted(res.items()))}
43+
impacts.update({"gnat": sorted(db.config["gnat"].keys())})
4344

4445
with open("./lkql_checker/share/lkql/kp/kp.json", "w", encoding="utf-8") as f:
4546
json.dump(impacts, f, ensure_ascii=False, indent=4)
46-
47-
with open("./lkql_checker/share/lkql/kp/kp.json", "a", encoding="utf-8") as f:
4847
f.write("\n")

0 commit comments

Comments
 (0)