Skip to content

Commit 66a24cd

Browse files
authored
Remove regex in getTrafficLightData API (#988)
Signed-off-by: Lan Xia <[email protected]>
1 parent 7a6db8f commit 66a24cd

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

TestResultSummaryService/routes/getTrafficLightData.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ const ObjectID = require('mongodb').ObjectID;
44
module.exports = async (req, res) => {
55
const db = new TestResultsDB();
66
let results = null;
7-
let rootBuildId;
8-
if (req.query.rootBuildId) {
9-
rootBuildId = new ObjectID(req.query.rootBuildId);
7+
let parentId;
8+
if (req.query.parentId) {
9+
parentId = new ObjectID(req.query.parentId);
1010
}
1111
let query = {
12-
buildName: {
13-
$regex: 'Perf_openjdk.*perf_.*(?<!test|baseline)$',
14-
},
15-
rootBuildId,
12+
parentId,
1613
};
1714
if (req.query.buildType === 'baseline' || req.query.buildType === 'test') {
1815
const aggregateInfoBuildNameRegex = `.*_${req.query.buildType}`;

test-result-summary-client/src/TrafficLight/TrafficLight.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function TrafficLight() {
5757

5858
const handleCompare = async () => {
5959
let testData = await fetchData(
60-
`/api/getTrafficLightData?rootBuildId=${testBuild}&buildType=test`
60+
`/api/getTrafficLightData?parentId=${testBuild}&buildType=test`
6161
);
6262
let baselineData = [];
6363
// Use aggregateInfo.BuildName Perf_openjdkxxx_test as test build.
@@ -66,11 +66,11 @@ function TrafficLight() {
6666
// Otherwise, use aggregateInfo.BuildName Perf_openjdkxxx_test as baseline build.
6767
if (baselineBuild === testBuild) {
6868
baselineData = await fetchData(
69-
`/api/getTrafficLightData?rootBuildId=${baselineBuild}&buildType=baseline`
69+
`/api/getTrafficLightData?parentId=${baselineBuild}&buildType=baseline`
7070
);
7171
} else {
7272
baselineData = await fetchData(
73-
`/api/getTrafficLightData?rootBuildId=${baselineBuild}&buildType=test`
73+
`/api/getTrafficLightData?parentId=${baselineBuild}&buildType=test`
7474
);
7575
}
7676

0 commit comments

Comments
 (0)