Merge pull request #3294 from vkarak/bugfix/disjoint-sets-groups-cols

[bugfix] Fix query error when aggregation groups and presentation columns are disjoint

Author: vkarak

reframe/frontend/reporting/__init__.py

@@ -576,6 +576,7 @@ def _group_key(groups, testcase: _TCProxy):
 @time_function
 def _group_testcases(testcases, groups, columns):
     grouped = {}
+    record_cols = groups + [c for c in columns if c not in groups]
     for tc in map(_TCProxy, testcases):
         for pvar, reftuple in tc['perfvalues'].items():
             pvar = pvar.split(':')[-1]
@@ -587,7 +588,7 @@ def _group_testcases(testcases, groups, columns):
 
             plower = pref * (1 + plower) if plower is not None else -math.inf
             pupper = pref * (1 + pupper) if pupper is not None else math.inf
-            record = _TCProxy(tc, include_only=columns)
+            record = _TCProxy(tc, include_only=record_cols)
             record.update({
                 'pvar': pvar,
                 'pval': pval,

unittests/test_cli.py

@@ -1297,6 +1297,13 @@ def test_storage_options(run_reframe, tmp_path, table_format):
     assert_no_crash(*run_reframe2(
         action=f'--list-stored-testcases={uuid}/mean:/'
     ))
+
+    # Check disjoint sets of groups and columns
+    assert_no_crash(*run_reframe2(
+        action='--list-stored-testcases=now-1d:now/mean:uuid/name'
+    ))
+
+    # Describe test cases
     assert_no_crash(
         *run_reframe2(action=f'--describe-stored-testcases={uuid}')
     )
@@ -1357,6 +1364,13 @@ def assert_no_crash(returncode, stdout, stderr, exitcode=0):
         )
     )
 
+    # Check disjoint sets of groups and columns
+    assert_no_crash(
+        *run_reframe2(
+            action='--performance-compare=now-1m:now/now-1d:now/mean:uuid/name'
+        )
+    )
+
     # Check that invalid arguments do not crash the CLI
     assert_no_crash(
         *run_reframe2(