From f225ac3de291808da4f8382a18d5f3bbe98efff9 Mon Sep 17 00:00:00 2001
From: Andrew Theurer <atheurer@redhat.com>
Date: Tue, 16 Dec 2025 14:23:07 -0500
Subject: [PATCH 1/2] fix breaout match and debug output on get-result

---
 queries/cdmq/cdm.js                | 13 ++++++++++---
 queries/cdmq/get-result-summary.js |  8 --------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/queries/cdmq/cdm.js b/queries/cdmq/cdm.js
index 4e36cb77..4d9686f0 100644
--- a/queries/cdmq/cdm.js
+++ b/queries/cdmq/cdm.js
@@ -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 +
             '::' +
@@ -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
diff --git a/queries/cdmq/get-result-summary.js b/queries/cdmq/get-result-summary.js
index d6d370c0..a47bf9eb 100644
--- a/queries/cdmq/get-result-summary.js
+++ b/queries/cdmq/get-result-summary.js
@@ -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) {

From 0ab81959fb28b9afd1007f41350a7448084be6a2 Mon Sep 17 00:00:00 2001
From: Andrew Theurer <atheurer@redhat.com>
Date: Tue, 16 Dec 2025 14:38:25 -0500
Subject: [PATCH 2/2] prettier

---
 queries/cdmq/cdm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/cdmq/cdm.js b/queries/cdmq/cdm.js
index 4d9686f0..1182f7b8 100644
--- a/queries/cdmq/cdm.js
+++ b/queries/cdmq/cdm.js
@@ -3228,7 +3228,7 @@ 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++) {
-        var breakout = 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 = /([^\=]+)\=([^\=]+)/;