Fix list commit bug (#7470)

Fix list commit bug introduced by compiler

Author: yangw-dev

torchci/lib/benchmark/api_helper/backend/common/utils.ts

@@ -1,5 +1,6 @@
 // Utility to extract params from either GET or POST
 import dayjs from "dayjs";
+import { queryClickhouseSaved } from "lib/clickhouse";
 import { NextApiRequest } from "next";
 import { BenchmarkCompilerListCommitQueryBuilder } from "../dataFetchers/queryBuilderUtils/compilerQueryBuilder";
 import { CommitResult } from "./type";
@@ -380,19 +381,34 @@ function subsampleCommitsByDate(data: any[], maxCount: number | undefined) {
   };
 }
 
-async function listCommitsFromDb(queryParams: any) {
+async function listCompilerCommitsFromDb(queryParams: any) {
   // fetch metadata from db
   const fetcher = new BenchmarkCompilerListCommitQueryBuilder();
   const data = await fetcher.applyQuery(queryParams);
   const result = fetcher.postProcess(data);
   return result;
 }
 
-export async function getCommitsWithSampling(
+export async function listGeneralCommits(tableName: string, queryParams: any) {
+  const commit_results = await queryClickhouseSaved(tableName, queryParams);
+  let maxCount = undefined;
+  // if subsampling is specified, use it
+  if (queryParams.sampling) {
+    maxCount = queryParams.sampling.max;
+    const res = subsampleCommitsByDate(commit_results, maxCount);
+    return res;
+  }
+  return {
+    data: commit_results,
+    is_sampled: false,
+  };
+}
+
+export async function getCompilerCommitsWithSampling(
   tableName: string,
   queryParams: any
 ): Promise<CommitResult> {
-  const commit_results = await listCommitsFromDb(queryParams);
+  const commit_results = await listCompilerCommitsFromDb(queryParams);
   let maxCount = undefined;
   // if subsampling is specified, use it
   if (queryParams.sampling) {

torchci/lib/benchmark/api_helper/backend/compilers/compiler_benchmark_data.ts

@@ -5,7 +5,7 @@ import {
 } from "../common/type";
 import {
   emptyTimeSeriesResponse,
-  getCommitsWithSampling,
+  getCompilerCommitsWithSampling,
 } from "../common/utils";
 import { BenchmarkCompilerBenchmarkDataQueryBuilder } from "../dataFetchers/queryBuilderUtils/compilerQueryBuilder";
 import { extractBackendSqlStyle, toApiArch } from "./helpers/common";
@@ -63,7 +63,7 @@ export async function getCompilerCommits(
   if (!inputParams.startTime || !inputParams.stopTime) {
     throw new Error("no start/end time provided in request");
   }
-  return await getCommitsWithSampling(
+  return await getCompilerCommitsWithSampling(
     COMPILER_BENCHMARK_COMMITS_TABLE_NAME,
     inputParams
   );
@@ -91,7 +91,7 @@ export async function getCompilerBenchmarkTimeRangeQueryParams(
     );
   }
   if (!queryParams.workflows || queryParams.workflows.length == 0) {
-    const { data: commit_results } = await getCommitsWithSampling(
+    const { data: commit_results } = await getCompilerCommitsWithSampling(
       COMPILER_BENCHMARK_COMMITS_TABLE_NAME,
       queryParams
     );

torchci/lib/benchmark/api_helper/backend/list_commits.ts

@@ -1,5 +1,5 @@
 import { CommitResult } from "./common/type";
-import { getCommitsWithSampling, groupByBenchmarkData } from "./common/utils";
+import { groupByBenchmarkData, listGeneralCommits } from "./common/utils";
 import { getCompilerCommits } from "./compilers/compiler_benchmark_data";
 
 const BENCHMARK_DEFAULT_LIST_COMMITS_QUERY_NAME =
@@ -62,7 +62,7 @@ async function getBenmarkCommits(
     case "compiler_precompute":
       return await getCompilerCommits(query_params);
     default:
-      return await getCommits(query_params);
+      return await getGeneralCommits(query_params);
   }
 }
 
@@ -91,7 +91,7 @@ const defaultGetCommitsInputs: any = {
   mode: "",
 };
 
-export async function getCommits(inputparams: any) {
+export async function getGeneralCommits(inputparams: any) {
   if (!inputparams.repo) {
     throw new Error("no repo provided in request");
   }
@@ -126,7 +126,7 @@ export async function getCommits(inputparams: any) {
     queryParams
   );
 
-  return await getCommitsWithSampling(
+  return await listGeneralCommits(
     BENCHMARK_DEFAULT_LIST_COMMITS_QUERY_NAME,
     queryParams
   );