Skip to content

fix breaout match and debug output on get-result #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atheurer merged 2 commits into from
Dec 16, 2025
Merged

fix breaout match and debug output on get-result #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f225ac3
fix breaout match and debug output on get-result
atheurer Dec 16, 2025
0ab8195
prettier
atheurer Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions queries/cdmq/cdm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3228,10 +3228,18 @@ getMetricDataSets = async function (instance, sets, yearDotMonth) {
for (var i = 0; i < sets.length; i++) {
if (sets[i].breakout != 'undefined') {
for (var j = 0; j < sets[i].breakout.length; j++) {
if (!setBreakouts[i].includes(sets[i].breakout[j])) {
var breakout = sets[i].breakout[j];
// The breakout requested might have a match included, for example, csid=1. We only
// want the string before the '='
var regExp = /([^\=]+)\=([^\=]+)/;
var matches = regExp.exec(breakout);
if (matches) {
breakout = matches[1];
}
if (!setBreakouts[i].includes(breakout)) {
retMsg +=
'ERROR: the breakout [' +
sets[i].breakout[j] +
breakout +
'] was not found for [' +
sets[i].source +
'::' +
Expand Down Expand Up @@ -3270,7 +3278,6 @@ getMetricDataSets = async function (instance, sets, yearDotMonth) {
retCode = 1;
return { 'ret-code': retCode, 'ret-msg': retMsg };
}
//var setBreakouts = await mgetMetricNames(instance, runIds, sources, types, yearDotMonth);

for (var i = 0; i < sets.length; i++) {
// Rearrange the actual data into 'values' section
Expand Down
8 changes: 0 additions & 8 deletions queries/cdmq/get-result-summary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,14 +365,6 @@ async function main() {
var sourceType = primaryMetrics[k].split('::');
var thisChunk = Math.floor(idx / batchedQuerySize);
var thisIdx = idx % batchedQuerySize;
console.log(
'metricDataSetsChunks[' +
thisChunk +
'][' +
thisIdx +
'] ' +
JSON.stringify(metricDataSetsChunks[thisChunk][thisIdx], null, 2)
);
msampleVal = parseFloat(metricDataSetsChunks[thisChunk][thisIdx].values[''][0].value);
thisSample['values'][primaryMetrics[k]] = msampleVal;
if (allBenchMsampleVals[k] == null) {
Expand Down
Loading