Skip to content

Commit 72ab83f

Browse files
committed
Remove createLockFile argument
1 parent cecd803 commit 72ab83f

File tree

4 files changed

+0
-24
lines changed

4 files changed

+0
-24
lines changed

extensions/ql-vscode/src/local-queries/run-query.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { CancellationToken } from "vscode";
2-
import { CodeQLCliServer } from "../codeql-cli/cli";
32
import { ProgressCallback } from "../common/vscode/progress";
43
import { DatabaseItem } from "../databases/local-databases";
54
import { CoreCompletedQuery, QueryRunner } from "../query-server";
6-
import { createLockFileForStandardQuery } from "./standard-queries";
75
import { TeeLogger, showAndLogExceptionWithTelemetry } from "../common/logging";
86
import { QueryResultType } from "../query-server/new-messages";
97
import { extLogger } from "../common/logging/vscode";
@@ -12,7 +10,6 @@ import { redactableError } from "../common/errors";
1210
import { basename } from "path";
1311

1412
type RunQueryOptions = {
15-
cliServer: CodeQLCliServer;
1613
queryRunner: QueryRunner;
1714
databaseItem: DatabaseItem;
1815
queryPath: string;
@@ -21,11 +18,9 @@ type RunQueryOptions = {
2118
extensionPacks: string[] | undefined;
2219
progress: ProgressCallback;
2320
token: CancellationToken;
24-
createLockFile: boolean;
2521
};
2622

2723
export async function runQuery({
28-
cliServer,
2924
queryRunner,
3025
databaseItem,
3126
queryPath,
@@ -34,18 +29,7 @@ export async function runQuery({
3429
extensionPacks,
3530
progress,
3631
token,
37-
createLockFile,
3832
}: RunQueryOptions): Promise<CoreCompletedQuery | undefined> {
39-
let cleanupLockFile: (() => Promise<void>) | undefined = undefined;
40-
if (createLockFile) {
41-
// Create a lock file for the query. This is required to resolve dependencies and library path for the query.
42-
const { cleanup } = await createLockFileForStandardQuery(
43-
cliServer,
44-
queryPath,
45-
);
46-
cleanupLockFile = cleanup;
47-
}
48-
4933
// Create a query run to execute
5034
const queryRun = queryRunner.createQueryRun(
5135
databaseItem.databaseUri.fsPath,
@@ -68,8 +52,6 @@ export async function runQuery({
6852
new TeeLogger(queryRunner.logger, queryRun.outputDir.logPath),
6953
);
7054

71-
await cleanupLockFile?.();
72-
7355
if (completedQuery.resultType !== QueryResultType.SUCCESS) {
7456
void showAndLogExceptionWithTelemetry(
7557
extLogger,

extensions/ql-vscode/src/model-editor/auto-model-codeml-queries.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ export async function runAutoModelQueries({
7575

7676
// Run the actual query
7777
const completedQuery = await runQuery({
78-
cliServer,
7978
queryRunner,
8079
databaseItem,
8180
queryPath,
@@ -84,7 +83,6 @@ export async function runAutoModelQueries({
8483
extensionPacks,
8584
progress,
8685
token: cancellationTokenSource.token,
87-
createLockFile: false,
8886
});
8987

9088
if (!completedQuery) {

extensions/ql-vscode/src/model-editor/external-api-usage-queries.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export async function runExternalApiQueries(
9292

9393
// Run the actual query
9494
const completedQuery = await runQuery({
95-
cliServer,
9695
queryRunner,
9796
databaseItem,
9897
queryPath,
@@ -106,7 +105,6 @@ export async function runExternalApiQueries(
106105
message: update.message,
107106
}),
108107
token,
109-
createLockFile: false,
110108
});
111109

112110
if (!completedQuery) {

extensions/ql-vscode/src/model-editor/flow-model-queries.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ async function runSingleFlowQuery(
120120

121121
// Run the query
122122
const completedQuery = await runQuery({
123-
cliServer,
124123
queryRunner,
125124
databaseItem,
126125
queryPath,
@@ -134,7 +133,6 @@ async function runSingleFlowQuery(
134133
maxStep: 4000,
135134
}),
136135
token,
137-
createLockFile: false,
138136
});
139137

140138
if (!completedQuery) {

0 commit comments

Comments
 (0)