Calculate statistics in a single pass

smarr · May 8, 2023 · 50810d4 · 50810d4
1 parent 75e3cae
commit 50810d4
Show file tree

Hide file tree

Showing 9 changed files with 580 additions and 751 deletions.
diff --git a/src/charts.ts b/src/charts.ts
@@ -129,17 +129,19 @@ function toDataSetWithFastSlowBackground(data: ChangeData): any[] {
   ];
 }
 
-export function createCanvas(
-  height: number,
-  width: number,
-  outputType: 'svg' | 'png' = 'png',
-  plotType: 'boxplot' | 'violin' = 'boxplot'
-): ChartJSNodeCanvas {
+export interface CanvasSettings {
+  height: number;
+  width: number;
+  outputType: 'svg' | 'png';
+  plotType: 'boxplot' | 'violin';
+}
+
+export function createCanvas(settings: CanvasSettings): ChartJSNodeCanvas {
   const plugins: any[] = ['chartjs-plugin-annotation'];
 
   const canvasOptions: ChartJSNodeCanvasOptions = {
-    width,
-    height,
+    width: settings.width,
+    height: settings.height,
     backgroundColour: siteAesthetics.backgroundColor,
     plugins: { modern: plugins },
     chartCallback: (ChartJS) => {
@@ -154,7 +156,7 @@ export function createCanvas(
         }
       });
 
-      if (plotType === 'boxplot') {
+      if (settings.plotType === 'boxplot') {
         ChartJS.register(BoxPlotController, BoxAndWiskers);
         ChartJS.registry.addControllers(BoxPlotController, BoxAndWiskers);
         ChartJS.registry.addElements(BoxAndWiskers);
@@ -166,7 +168,7 @@ export function createCanvas(
     }
   };
 
-  if (outputType === 'svg') {
+  if (settings.outputType === 'svg') {
     (<any>canvasOptions).type = 'svg'; // work around the readonly property
   }
   return new ChartJSNodeCanvas(canvasOptions);
@@ -249,12 +251,12 @@ export async function renderOverviewComparison(
   outputType: 'svg' | 'png' = 'png',
   plotType: 'boxplot' | 'violin' = 'boxplot'
 ): Promise<Buffer> {
-  const chartJSNodeCanvas = createCanvas(
-    calculatePlotHeight(title, data),
-    siteAesthetics.overviewPlotWidth,
+  const chartJSNodeCanvas = createCanvas({
+    height: calculatePlotHeight(title, data),
+    width: siteAesthetics.overviewPlotWidth,
     outputType,
     plotType
-  );
+  });
 
   return renderDataOnCanvas(
     chartJSNodeCanvas,

diff --git a/src/db-data-processing.ts b/src/db-data-processing.ts
@@ -130,7 +130,9 @@ function findOrConstructMeasurements(
     values: [],
     envId: row.envid,
     commitId: row.commitid,
-    runSettings: runSetting
+    runSettings: runSetting,
+    runId: row.runid,
+    trialId: row.trialid
   };
   benchResult.measurements.push(m);
   forSuiteByBench.criteria[criterion.name] = criterion;

diff --git a/src/db.ts b/src/db.ts
@@ -21,7 +21,7 @@ import pg, { PoolConfig, QueryConfig, QueryResultRow } from 'pg';
 import { getDirname, TotalCriterion } from './util.js';
 import { assert } from './logging.js';
 import { simplifyCmdline } from './views/util.js';
-import { ComparisonStatistics, SummaryStatistics } from './stats.js';
+import { SummaryStatistics } from './stats.js';
 import { BatchingTimelineUpdater } from './timeline-calc.js';
 
 const __dirname = getDirname(import.meta.url);
@@ -229,10 +229,11 @@ export interface Measurements {
   values: number[][];
 
   envId: number;
+  runId: number;
+  trialId: number;
   runSettings: RunSettings;
   commitId: string;
   stats?: SummaryStatistics;
-  changeStats?: ComparisonStatistics;
 }
 
 export interface ProcessedResult {