From 79745f32066cd2df2d03ea12a7d7209ceaa035fc Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Tue, 25 Nov 2025 17:06:28 +0000 Subject: [PATCH 1/2] Deprecate `codeQL.runningQueries.saveCache` setting --- extensions/ql-vscode/package.json | 1 + extensions/ql-vscode/src/config.ts | 7 ------- .../ql-vscode/src/query-server/query-server-client.ts | 4 ---- .../query-server/query-server-client.test.ts | 1 - .../test/vscode-tests/minimal-workspace/config.test.ts | 5 ----- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index ccf239971fe..4c586bf4440 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -195,6 +195,7 @@ "type": "boolean", "default": false, "scope": "window", + "deprecationMessage": "This setting no longer has any effect.", "description": "Aggressively save intermediate results to the disk cache. This may speed up subsequent queries if they are similar. Be aware that using this option will greatly increase disk usage and initial evaluation time." }, "codeQL.runningQueries.cacheSize": { diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index 7e24fe26c5c..1d262c15634 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -226,7 +226,6 @@ const NUMBER_OF_THREADS_SETTING = new Setting( "numberOfThreads", RUNNING_QUERIES_SETTING, ); -const SAVE_CACHE_SETTING = new Setting("saveCache", RUNNING_QUERIES_SETTING); const CACHE_SIZE_SETTING = new Setting("cacheSize", RUNNING_QUERIES_SETTING); const TIMEOUT_SETTING = new Setting("timeout", RUNNING_QUERIES_SETTING); const MEMORY_SETTING = new Setting("memory", RUNNING_QUERIES_SETTING); @@ -257,7 +256,6 @@ const CUSTOM_LOG_DIRECTORY_SETTING = new Setting( /** When these settings change, the running query server should be restarted. */ const QUERY_SERVER_RESTARTING_SETTINGS = [ NUMBER_OF_THREADS_SETTING, - SAVE_CACHE_SETTING, CACHE_SIZE_SETTING, MEMORY_SETTING, DEBUG_SETTING, @@ -268,7 +266,6 @@ export interface QueryServerConfig { codeQlPath: string; debug: boolean; numThreads: number; - saveCache: boolean; cacheSize: number; queryMemoryMb?: number; timeoutSecs: number; @@ -432,10 +429,6 @@ export class QueryServerConfigListener return NUMBER_OF_THREADS_SETTING.getValue(); } - public get saveCache(): boolean { - return SAVE_CACHE_SETTING.getValue(); - } - public get cacheSize(): number { return CACHE_SIZE_SETTING.getValue() || 0; } diff --git a/extensions/ql-vscode/src/query-server/query-server-client.ts b/extensions/ql-vscode/src/query-server/query-server-client.ts index 3eb18e1194c..c17f4212d73 100644 --- a/extensions/ql-vscode/src/query-server/query-server-client.ts +++ b/extensions/ql-vscode/src/query-server/query-server-client.ts @@ -190,10 +190,6 @@ export class QueryServerClient extends DisposableObject { ramArgs, ); - if (this.config.saveCache) { - args.push("--save-cache"); - } - if (this.config.cacheSize > 0) { args.push("--max-disk-cache"); args.push(this.config.cacheSize.toString()); diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/query-server/query-server-client.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/query-server/query-server-client.test.ts index 3fe7c6fadfb..655e30acc31 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/query-server/query-server-client.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/query-server/query-server-client.test.ts @@ -124,7 +124,6 @@ describeWithCodeQL()("using the query server", () => { debug: false, cacheSize: 0, numThreads: 1, - saveCache: false, timeoutSecs: 0, }, cliServer, diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts index 65dfcdc7394..7c930a3dd56 100644 --- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts @@ -65,11 +65,6 @@ describe("config listeners", () => { property: "numThreads", values: [0, 1], }, - { - name: "codeQL.runningQueries.saveCache", - property: "saveCache", - values: [false, true], - }, { name: "codeQL.runningQueries.cacheSize", property: "cacheSize", From f7fcc9e06f6394f03752c8f41fd0a877f12ad055 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Tue, 25 Nov 2025 17:13:36 +0000 Subject: [PATCH 2/2] Add changenote for deprecating codeQL.runningQueries.saveCache --- extensions/ql-vscode/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 7ae525af5fc..307fae5396e 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -3,6 +3,7 @@ ## [UNRELEASED] - Rename command "CodeQL: Trim Overlay Base Cache" to "CodeQL: Trim Cache to Overlay-Base" for consistency with "CodeQL: Warm Overlay-Base Cache for [...]" commands. [#4204](https://github.com/github/vscode-codeql/pull/4204) +- Deprecate the setting (`codeQL.runningQueries.saveCache`) that aggressively saved intermediate results to the disk cache. [#4210](https://github.com/github/vscode-codeql/pull/4210) ## 1.17.6 - 24 October 2025