fix: store now works peroply with new types

salesforce · Jun 20, 2019 · 718170f · 718170f
1 parent cf40e33
commit 718170f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 42 deletions.
diff --git a/packages/@best/api-db/src/store.ts b/packages/@best/api-db/src/store.ts
@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import { loadDbFromConfig } from './utils';
 import { TemporarySnapshot, Metric } from './types';
-import { FrozenGlobalConfig, BenchmarkResultsSnapshot, StatsNode, RunnerConfig } from '@best/types';
+import { FrozenGlobalConfig, BenchmarkResultsSnapshot, BenchmarkMetricNames, StatsNode } from '@best/types';
 
 interface RunSettings {
     similarityHash: string;
@@ -19,19 +19,39 @@ function md5(data: string) {
         .digest('hex');
 }
 
-const generateSnapshots = (runSettings: RunSettings, benchmarks: StatsNode[], snapshots: TemporarySnapshot[] = []): TemporarySnapshot[] => {
-    const things: TemporarySnapshot[] = benchmarks.reduce((results, benchmark): TemporarySnapshot[] => {
+const generateSnapshots = (runSettings: RunSettings, benchmarks: StatsNode[], groupName?: string): TemporarySnapshot[] => {
+    return benchmarks.reduce((results, benchmark): TemporarySnapshot[] => {
         if (benchmark.type === "benchmark") {
-            Object.keys(benchmark.metrics).forEach((key: string) => {
-                const values = benchmark.metrics[key as BenchmarkMetricNames].stats;
+            const metrics = Object.keys(benchmark.metrics).reduce((results, metricName: string): Metric[] => {
+                const values = benchmark.metrics[metricName as BenchmarkMetricNames];
+
+                if (values) {
+                    return [
+                        ...results,
+                        {
+                            name: metricName,
+                            duration: values.stats.median,
+                            stdDeviation: values.stats.medianAbsoluteDeviation
+                        }
+                    ]
+                }
+
+                return results;
+            }, <Metric[]>[])
+
+            const snapshot: TemporarySnapshot = {
+                ...runSettings,
+                name: `${groupName ? groupName + '/' : ''}${benchmark.name}`,
+                metrics: metrics
+            }
 
-            })
+            return [...results, snapshot]
+        } else if (benchmark.type === "group") {
+            return [...results, ...generateSnapshots(runSettings, benchmark.nodes, benchmark.name)]
         }
 
         return results;
     }, <TemporarySnapshot[]>[])
-
-    return snapshots;
 }
 
 export const saveBenchmarkSummaryInDB = (benchmarkResults: BenchmarkResultsSnapshot[], globalConfig: FrozenGlobalConfig) => {
@@ -61,34 +81,12 @@ export const saveBenchmarkSummaryInDB = (benchmarkResults: BenchmarkResultsSnaps
                 branch
             }
 
-            const snapshotsToSave: TemporarySnapshot[] = [];
-
-            if (! stats) { return };
-
-            stats.results.map((node) => {
-
-            })
-
-            stats.benchmarks.forEach((element: any) => {
-                element.benchmarks.forEach((bench: any) => {
-                    const metricKeys = Object.keys(bench).filter(key => key !== 'name')
-                    const metrics = metricKeys.map(name => ({
-                        name,
-                        duration: bench[name].median,
-                        stdDeviation: bench[name].medianAbsoluteDeviation,
-                    }))
-
-                    const snapshot = {
-                        ...runSettings,
-                        name: `${element.name}/${bench.name}`,
-                        metrics: metrics
-                    }
-                    snapshotsToSave.push(snapshot);
-
-                });
-            });
-
-            return db.saveSnapshots(snapshotsToSave, projectName);
+            if (stats) {
+                const snapshots = generateSnapshots(runSettings, stats.results);
+                return db.saveSnapshots(snapshots, projectName);
+            } else {
+                return false;
+            }
         }),
     );
 }
diff --git a/...ng_name_folder/at_least_this_should_be_more_than_hundred_chars/js_execution3.benchmark.js b/...ng_name_folder/at_least_this_should_be_more_than_hundred_chars/js_execution3.benchmark.js
@@ -2,7 +2,7 @@ function fib(n) {
     return n <= 1 ? 1 : fib(n - 1) + fib(n - 2);
 }
 
-describe('js-execution2', () => {
+describe('js-execution3', () => {
     benchmark('fibonacci', () => {
         run(() => {
             return fib(15);

diff --git a/packages/best-benchmarks/best.config.js b/packages/best-benchmarks/best.config.js
@@ -1,7 +1,3 @@
 module.exports = {
-    projectName: 'best-benchmark',
-    apiDatabase: {
-        adapter: 'sql/postgres',
-        path: `postgresql://localhost`
-    }
+    projectName: 'best-benchmark'
 };