Remove createLockFile argument
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
import { CancellationToken } from "vscode";
|
||||
import { CodeQLCliServer } from "../codeql-cli/cli";
|
||||
import { ProgressCallback } from "../common/vscode/progress";
|
||||
import { DatabaseItem } from "../databases/local-databases";
|
||||
import { CoreCompletedQuery, QueryRunner } from "../query-server";
|
||||
import { createLockFileForStandardQuery } from "./standard-queries";
|
||||
import { TeeLogger, showAndLogExceptionWithTelemetry } from "../common/logging";
|
||||
import { QueryResultType } from "../query-server/new-messages";
|
||||
import { extLogger } from "../common/logging/vscode";
|
||||
@@ -12,7 +10,6 @@ import { redactableError } from "../common/errors";
|
||||
import { basename } from "path";
|
||||
|
||||
type RunQueryOptions = {
|
||||
cliServer: CodeQLCliServer;
|
||||
queryRunner: QueryRunner;
|
||||
databaseItem: DatabaseItem;
|
||||
queryPath: string;
|
||||
@@ -21,11 +18,9 @@ type RunQueryOptions = {
|
||||
extensionPacks: string[] | undefined;
|
||||
progress: ProgressCallback;
|
||||
token: CancellationToken;
|
||||
createLockFile: boolean;
|
||||
};
|
||||
|
||||
export async function runQuery({
|
||||
cliServer,
|
||||
queryRunner,
|
||||
databaseItem,
|
||||
queryPath,
|
||||
@@ -34,18 +29,7 @@ export async function runQuery({
|
||||
extensionPacks,
|
||||
progress,
|
||||
token,
|
||||
createLockFile,
|
||||
}: RunQueryOptions): Promise<CoreCompletedQuery | undefined> {
|
||||
let cleanupLockFile: (() => Promise<void>) | undefined = undefined;
|
||||
if (createLockFile) {
|
||||
// Create a lock file for the query. This is required to resolve dependencies and library path for the query.
|
||||
const { cleanup } = await createLockFileForStandardQuery(
|
||||
cliServer,
|
||||
queryPath,
|
||||
);
|
||||
cleanupLockFile = cleanup;
|
||||
}
|
||||
|
||||
// Create a query run to execute
|
||||
const queryRun = queryRunner.createQueryRun(
|
||||
databaseItem.databaseUri.fsPath,
|
||||
@@ -68,8 +52,6 @@ export async function runQuery({
|
||||
new TeeLogger(queryRunner.logger, queryRun.outputDir.logPath),
|
||||
);
|
||||
|
||||
await cleanupLockFile?.();
|
||||
|
||||
if (completedQuery.resultType !== QueryResultType.SUCCESS) {
|
||||
void showAndLogExceptionWithTelemetry(
|
||||
extLogger,
|
||||
|
||||
@@ -75,7 +75,6 @@ export async function runAutoModelQueries({
|
||||
|
||||
// Run the actual query
|
||||
const completedQuery = await runQuery({
|
||||
cliServer,
|
||||
queryRunner,
|
||||
databaseItem,
|
||||
queryPath,
|
||||
@@ -84,7 +83,6 @@ export async function runAutoModelQueries({
|
||||
extensionPacks,
|
||||
progress,
|
||||
token: cancellationTokenSource.token,
|
||||
createLockFile: false,
|
||||
});
|
||||
|
||||
if (!completedQuery) {
|
||||
|
||||
@@ -92,7 +92,6 @@ export async function runExternalApiQueries(
|
||||
|
||||
// Run the actual query
|
||||
const completedQuery = await runQuery({
|
||||
cliServer,
|
||||
queryRunner,
|
||||
databaseItem,
|
||||
queryPath,
|
||||
@@ -106,7 +105,6 @@ export async function runExternalApiQueries(
|
||||
message: update.message,
|
||||
}),
|
||||
token,
|
||||
createLockFile: false,
|
||||
});
|
||||
|
||||
if (!completedQuery) {
|
||||
|
||||
@@ -120,7 +120,6 @@ async function runSingleFlowQuery(
|
||||
|
||||
// Run the query
|
||||
const completedQuery = await runQuery({
|
||||
cliServer,
|
||||
queryRunner,
|
||||
databaseItem,
|
||||
queryPath,
|
||||
@@ -134,7 +133,6 @@ async function runSingleFlowQuery(
|
||||
maxStep: 4000,
|
||||
}),
|
||||
token,
|
||||
createLockFile: false,
|
||||
});
|
||||
|
||||
if (!completedQuery) {
|
||||
|
||||
Reference in New Issue
Block a user