fix: test exclude performance

canyon-project · Sep 24, 2024 · 210eae9 · 210eae9
1 parent 08abcbd
commit 210eae9
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/packages/canyon-backend/prisma/schema.prisma b/packages/canyon-backend/prisma/schema.prisma
@@ -65,6 +65,7 @@ model Coverage {
   statementsCovered Int      @map("statements_covered")
   newlinesTotal     Int      @map("newlines_total")
   newlinesCovered   Int      @map("newlines_covered")
+  summary           String?
   // 代码覆盖率详情
   hit               String
   // 通用

diff --git a/packages/canyon-backend/src/coverage/services/core/consumer-coverage.service.ts b/packages/canyon-backend/src/coverage/services/core/consumer-coverage.service.ts
@@ -133,16 +133,15 @@ export class ConsumerCoverageService {
     })();
 
     const newcoverage = mergeCoverageMap(queueDataToBeConsumed.coverage, cov);
-    const sum: any = getSummaryByPath(
-      "",
-      genSummaryMapByCoverageMap(
-        await this.testExcludeService.invoke(
-          queueDataToBeConsumed.projectID,
-          newcoverage,
-        ),
-        codechanges,
+    const summary = genSummaryMapByCoverageMap(
+      await this.testExcludeService.invoke(
+        queueDataToBeConsumed.projectID,
+        newcoverage,
       ),
+      codechanges,
     );
+    const sum: any = getSummaryByPath("", summary);
+    const summaryZstd = await compressedData(JSON.stringify(summary));
 
     const hit = await compressedData(JSON.stringify(newcoverage));
     if (coverage) {
@@ -162,6 +161,7 @@ export class ConsumerCoverageService {
           branchesTotal: sum.branches.total,
           linesCovered: sum.lines.covered,
           linesTotal: sum.lines.total,
+          summary: summaryZstd,
           updatedAt: queueDataToBeConsumed.updatedAt,
           compareTarget: queueDataToBeConsumed.compareTarget,
         },
@@ -182,6 +182,7 @@ export class ConsumerCoverageService {
           branchesTotal: sum.branches.total,
           linesCovered: sum.lines.covered,
           linesTotal: sum.lines.total,
+          summary: summaryZstd,
           //以下都读的是queueDataToBeConsumed
           // key: queueDataToBeConsumed.key,
           branch: queueDataToBeConsumed.branch,

diff --git a/packages/canyon-backend/src/coverage/services/coverage-client.service.ts b/packages/canyon-backend/src/coverage/services/coverage-client.service.ts
@@ -139,6 +139,7 @@ export class CoverageClientService {
       newlinesCovered: 0,
       newlinesTotal: 0,
       hit: "",
+      summary: "",
       coverage: coverageReport.coverage,
       instrumentCwd: coverageReport.instrumentCwd,
       createdAt: coverageReport.createdAt || new Date(),

diff --git a/packages/canyon-backend/src/coverage/services/coverage.service.ts b/packages/canyon-backend/src/coverage/services/coverage.service.ts
@@ -40,19 +40,45 @@ export class CoverageService {
     if (coverages.length === 0) {
       return [];
     }
-    const coverageData = await this.getCoverageDataFromAdapter(
-      projectID,
-      sha,
-      reportID,
-    ).then((r) => this.testExcludeService.invoke(coverages[0].projectID, r));
+
     const codechanges = await this.prisma.codechange.findMany({
       where: {
         compareTarget: coverages[0].compareTarget,
         sha: sha,
       },
     });
-    const covSummary = genSummaryMapByCoverageMap(coverageData, codechanges);
-    return Object.entries(covSummary).map(([key, value]) => {
+
+    let covSummary = await this.prisma.coverage
+      .findFirst({
+        where: removeNullKeys({
+          sha,
+          projectID,
+          reportID: reportID || null,
+          covType: reportID ? "agg" : "all",
+        }),
+      })
+      .then((cov) => {
+        if (cov && cov.summary) {
+          // zstd解压
+          return decompressedData(cov.summary).then((summary) => {
+            return JSON.parse(summary);
+          });
+        } else {
+          return null;
+        }
+      });
+
+    if (!covSummary) {
+      const coverageData = await this.getCoverageDataFromAdapter(
+        projectID,
+        sha,
+        reportID,
+      ).then((r) => this.testExcludeService.invoke(coverages[0].projectID, r));
+
+      covSummary = genSummaryMapByCoverageMap(coverageData, codechanges);
+    }
+
+    return Object.entries(covSummary).map(([key, value]: any) => {
       return {
         path: key,
         ...value,
@@ -108,7 +134,6 @@ export class CoverageService {
         });
       }),
     );
-    // console.log(filepath,'filepath')
     const obj = {};
     coverageJsonMaps.forEach((item) => {
       if (hit[item.path]) {