Skip to content

Commit 0f59470

Browse files
committed
Remove CLI_VERSION_WITH_STRUCTURED_EVAL_LOG constraint
1 parent 3064415 commit 0f59470

2 files changed

Lines changed: 4 additions & 18 deletions

File tree

extensions/ql-vscode/src/codeql-cli/cli.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,12 +1803,6 @@ export class CliVersionConstraint {
18031803
*/
18041804
public static CLI_VERSION_WITH_RESOLVE_EXTENSIONS = new SemVer("2.10.2");
18051805

1806-
/**
1807-
* CLI version where the `--evaluator-log` and related options to the query server were introduced,
1808-
* on a per-query server basis.
1809-
*/
1810-
public static CLI_VERSION_WITH_STRUCTURED_EVAL_LOG = new SemVer("2.8.2");
1811-
18121806
/**
18131807
* CLI version that supports rotating structured logs to produce one per query.
18141808
*
@@ -1885,12 +1879,6 @@ export class CliVersionConstraint {
18851879
);
18861880
}
18871881

1888-
async supportsStructuredEvalLog() {
1889-
return this.isVersionAtLeast(
1890-
CliVersionConstraint.CLI_VERSION_WITH_STRUCTURED_EVAL_LOG,
1891-
);
1892-
}
1893-
18941882
async supportsPerQueryEvalLog() {
18951883
return this.isVersionAtLeast(
18961884
CliVersionConstraint.CLI_VERSION_WITH_PER_QUERY_EVAL_LOG,

extensions/ql-vscode/src/query-server/legacy/query-server-client.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,11 @@ export class QueryServerClient extends DisposableObject {
150150
args.push("--old-eval-stats");
151151
}
152152

153-
if (await this.cliServer.cliConstraints.supportsStructuredEvalLog()) {
154-
const structuredLogFile = `${this.opts.contextStoragePath}/structured-evaluator-log.json`;
155-
await ensureFile(structuredLogFile);
153+
const structuredLogFile = `${this.opts.contextStoragePath}/structured-evaluator-log.json`;
154+
await ensureFile(structuredLogFile);
156155

157-
args.push("--evaluator-log");
158-
args.push(structuredLogFile);
159-
}
156+
args.push("--evaluator-log");
157+
args.push(structuredLogFile);
160158

161159
if (this.config.debug) {
162160
args.push("--debug", "--tuple-counting");

0 commit comments

Comments
 (0)