Parse iteration_name_format before building url to fetch timeseries data

distributed-system-analysis · Mar 12, 2020 · ca82df5 · ca82df5
1 parent d061d5a
commit ca82df5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/services/dashboard.js b/src/services/dashboard.js
@@ -160,19 +160,29 @@ export async function queryTimeseriesData(params) {
   Object.keys(clusteredIterations).forEach(primaryMetric => {
     Object.keys(clusteredIterations[primaryMetric]).forEach(cluster => {
       Object.keys(clusteredIterations[primaryMetric][cluster]).forEach(iteration => {
+        const iterationMetadata = clusteredIterations[primaryMetric][cluster][iteration];
+        if (iterationMetadata.iteration_name_format !== undefined) {
+          iterationMetadata.iteration_name_format = iterationMetadata.iteration_name_format.replace(
+            '%d',
+            iterationMetadata.iteration_number
+          );
+          iterationMetadata.iteration_name_format = iterationMetadata.iteration_name_format.replace(
+            '%s',
+            iterationMetadata.iteration_name
+          );
+          iterationMetadata.name = iterationMetadata.iteration_name_format;
+        } else {
+          iterationMetadata.name = `${iterationMetadata.iteration_number}-${
+            iterationMetadata.iteration_name
+          }`;
+        }
         iterationRequests.push(
           request.get(
-            `${datastoreConfig.results}/incoming/${encodeURIComponent(
-              clusteredIterations[primaryMetric][cluster][iteration].controller_name
-            )}/${encodeURIComponent(
-              clusteredIterations[primaryMetric][cluster][iteration].result_name
-            )}/${encodeURIComponent(
-              clusteredIterations[primaryMetric][cluster][iteration].iteration_number
-            )}-${encodeURIComponent(
-              clusteredIterations[primaryMetric][cluster][iteration].iteration_name
-            )}/sample${encodeURIComponent(
-              clusteredIterations[primaryMetric][cluster][iteration].closest_sample
-            )}/result.json`
+            `${datastoreConfig.results}/incoming/${encodeURI(
+              iterationMetadata.controller_name
+            )}/${encodeURI(iterationMetadata.result_name)}/${encodeURI(
+              iterationMetadata.name
+            )}/sample${encodeURI(iterationMetadata.closest_sample)}/result.json`
           )
         );
       });

diff --git a/src/utils/parse.js b/src/utils/parse.js
@@ -28,6 +28,7 @@ export const parseIterationData = results => {
     result.iterationData.forEach(iteration => {
       let iterationMetadata = {
         iteration_name: iteration.iteration_name,
+        iteration_name_format: iteration.iteration_name_format,
         iteration_number: iteration.iteration_number,
         result_name: result.resultName,
         controller_name: result.controllerName,