Remove legacy result from query history items

The legacy result was populated based on information that is already present in `CompletedQueryInfo` anyway. Old history items which only have the legacy result populated have not been created for at least 30 days now since the legacy query runner hasn't been used for quite a while now.
2023-12-21 16:08:39 +01:00
parent 43ea7eb41d
commit ef575acd59
9 changed files with 0 additions and 67 deletions
--- a/extensions/ql-vscode/src/local-queries/local-query-run.ts
+++ b/extensions/ql-vscode/src/local-queries/local-query-run.ts
@@ -178,15 +178,6 @@ export class LocalQueryRun {
    const successful = results.resultType === QueryResultType.SUCCESS;
    return {
      query,
-      result: {
-        evaluationTime: results.evaluationTime,
-        queryId: 0,
-        resultType: successful
-          ? QueryResultType.SUCCESS
-          : QueryResultType.OTHER_ERROR,
-        runId: 0,
-        message,
-      },
      message,
      successful,
    };
--- a/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts
+++ b/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts
@@ -46,14 +46,6 @@ function mapCompletedQueryToDto(

  return {
    query: mapQueryEvaluationInfoToDto(query.query),
-    result: {
-      runId: query.result.runId,
-      queryId: query.result.queryId,
-      resultType: query.result.resultType,
-      evaluationTime: query.result.evaluationTime,
-      message: query.result.message,
-      logFileLocation: query.result.logFileLocation,
-    },
    logFileLocation: query.logFileLocation,
    successful: query.successful,
    message: query.message,
--- a/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts
+++ b/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts
@@ -56,14 +56,6 @@ function mapCompletedQueryInfoToDomainModel(

  return new CompletedQueryInfo(
    mapQueryEvaluationInfoToDomainModel(completedQuery.query),
-    {
-      runId: completedQuery.result.runId,
-      queryId: completedQuery.result.queryId,
-      resultType: completedQuery.result.resultType,
-      evaluationTime: completedQuery.result.evaluationTime,
-      message: completedQuery.result.message,
-      logFileLocation: completedQuery.result.logFileLocation,
-    },
    completedQuery.logFileLocation,
    completedQuery.successful ?? completedQuery.sucessful,
    completedQuery.message,
--- a/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto.ts
+++ b/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto.ts
@@ -52,7 +52,6 @@ export interface CompletedQueryInfoDto {

  // There once was a typo in the data model, which is why we need to support both
  sucessful?: boolean;
-  result: EvaluationResultDto;
  logFileLocation?: string;
  resultCount: number;
  sortedResultsInfo: Record<string, SortedResultSetInfoDto>;
@@ -81,15 +80,6 @@ export enum SortDirectionDto {
  desc,
 }

-interface EvaluationResultDto {
-  runId: number;
-  queryId: number;
-  resultType: number;
-  evaluationTime: number;
-  message?: string;
-  logFileLocation?: string;
-}
-
 export interface QueryEvaluationInfoDto {
  querySaveDir: string;
  dbItemPath: string;
--- a/extensions/ql-vscode/src/query-results.ts
+++ b/extensions/ql-vscode/src/query-results.ts
@@ -1,7 +1,6 @@
 import { CancellationTokenSource, env } from "vscode";

 import * as messages from "./query-server/messages-shared";
-import * as legacyMessages from "./query-server/legacy-messages";
 import * as cli from "./codeql-cli/cli";
 import { pathExists } from "fs-extra";
 import { basename } from "path";
@@ -23,7 +22,6 @@ import {
  QueryWithResults,
 } from "./run-queries-shared";
 import { sarifParser } from "./common/sarif-parser";
-import { formatLegacyMessage } from "./query-server/format-legacy-message";

 /**
 * query-results.ts
@@ -54,11 +52,6 @@ export interface InitialQueryInfo {
 export class CompletedQueryInfo implements QueryWithResults {
  constructor(
    public readonly query: QueryEvaluationInfo,
-
-    /**
-     * The legacy result. This is only set when loading from the query history.
-     */
-    public readonly result: legacyMessages.EvaluationResult,
    public readonly logFileLocation: string | undefined,
    public readonly successful: boolean | undefined,
    public readonly message: string | undefined,
@@ -85,8 +78,6 @@ export class CompletedQueryInfo implements QueryWithResults {
  get statusString(): string {
    if (this.message) {
      return this.message;
-    } else if (this.result) {
-      return formatLegacyMessage(this.result);
    } else {
      throw new Error("No status available");
    }
@@ -291,7 +282,6 @@ export class LocalQueryInfo {
  completeThisQuery(info: QueryWithResults): void {
    this.completedQuery = new CompletedQueryInfo(
      info.query,
-      info.result,
      info.query.logPath,
      info.successful,
      info.message,
--- a/extensions/ql-vscode/src/run-queries-shared.ts
+++ b/extensions/ql-vscode/src/run-queries-shared.ts
@@ -1,5 +1,4 @@
 import * as messages from "./query-server/messages-shared";
-import * as legacyMessages from "./query-server/legacy-messages";
 import { DatabaseInfo, QueryMetadata } from "./common/interface-types";
 import { join, parse, dirname, basename } from "path";
 import { Range, TextEditor, Uri, window, workspace } from "vscode";
@@ -367,7 +366,6 @@ export class QueryEvaluationInfo extends QueryOutputDir {

 export interface QueryWithResults {
  readonly query: QueryEvaluationInfo;
-  readonly result: legacyMessages.EvaluationResult;
  readonly logFileLocation?: string;
  readonly successful?: boolean;
  readonly message?: string;
--- a/extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts
+++ b/extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts
@@ -6,7 +6,6 @@ import {
  QueryWithResults,
 } from "../../../src/run-queries-shared";
 import { CancellationTokenSource } from "vscode";
-import { QueryResultType } from "../../../src/query-server/legacy-messages";
 import { QueryMetadata } from "../../../src/common/interface-types";
 import { QueryLanguage } from "../../../src/common/query-language";

@@ -94,11 +93,5 @@ export function createMockQueryWithResults({
      metadata,
    } as unknown as QueryEvaluationInfo,
    successful: didRunSuccessfully,
-    result: {
-      evaluationTime: 1,
-      queryId: 0,
-      runId: 0,
-      resultType: QueryResultType.SUCCESS,
-    },
  };
 }
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/store/query-history-store.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/store/query-history-store.test.ts
@@ -16,7 +16,6 @@ import {
 import { DatabaseInfo } from "../../../../../src/common/interface-types";
 import { CancellationTokenSource, Uri } from "vscode";
 import { tmpDir } from "../../../../../src/tmp-dir";
-import { QueryResultType } from "../../../../../src/query-server/legacy-messages";
 import { VariantAnalysisHistoryItem } from "../../../../../src/query-history/variant-analysis-history-item";
 import { QueryHistoryInfo } from "../../../../../src/query-history/query-history-info";
 import { createMockVariantAnalysisHistoryItem } from "../../../../factories/query-history/variant-analysis-history-item";
@@ -274,12 +273,6 @@ describe("write and read", () => {
      query: queryEvalInfo,
      successful: didRunSuccessfully,
      message: "foo",
-      result: {
-        evaluationTime: 1,
-        queryId: 0,
-        runId: 0,
-        resultType: QueryResultType.SUCCESS,
-      },
    };

    return result;
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts
@@ -471,12 +471,6 @@ describe("query-results", () => {
      query: queryEvalInfo,
      successful: didRunSuccessfully,
      message: "foo",
-      result: {
-        evaluationTime: 1,
-        queryId: 0,
-        runId: 0,
-        resultType: QueryResultType.SUCCESS,
-      },
    };

    return result;