From 3a2abf4a491f4bc5a1439ca3df5d95c0eb94893f Mon Sep 17 00:00:00 2001 From: Guoyu Su Date: Sat, 4 Jul 2026 02:19:10 +0800 Subject: [PATCH] fix(desktop): scale multi-statement query timeout (#2544) --- apps/desktop/src/lib/queryTimeout.ts | 11 ++++++++++- apps/desktop/src/stores/queryStore.ts | 6 +++--- packages/app-tests/queryTimeout.test.ts | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 packages/app-tests/queryTimeout.test.ts diff --git a/apps/desktop/src/lib/queryTimeout.ts b/apps/desktop/src/lib/queryTimeout.ts index 7f90a869cb..9b409d10ea 100644 --- a/apps/desktop/src/lib/queryTimeout.ts +++ b/apps/desktop/src/lib/queryTimeout.ts @@ -1,4 +1,5 @@ -import type { ConnectionConfig } from "@/types/database"; +import { splitSqlStatementRanges } from "@/lib/sqlStatementRanges"; +import type { ConnectionConfig, DatabaseType } from "@/types/database"; export const DEFAULT_QUERY_TIMEOUT_SECS = 30; @@ -6,3 +7,11 @@ export function queryTimeoutSecsForConnection(connection?: Pick= 0 ? value : DEFAULT_QUERY_TIMEOUT_SECS; } + +export function frontendQueryTimeoutSecsForSql(sql: string, databaseType: DatabaseType | undefined, queryTimeoutSecs: number): number { + if (queryTimeoutSecs === 0) return 0; + + const baseTimeoutSecs = Math.max(queryTimeoutSecs * 2, 60); + const statementCount = Math.max(splitSqlStatementRanges(sql, databaseType).length, 1); + return baseTimeoutSecs * statementCount; +} diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts index 440bb0b0a0..2ef3b59a9d 100644 --- a/apps/desktop/src/stores/queryStore.ts +++ b/apps/desktop/src/stores/queryStore.ts @@ -33,7 +33,7 @@ import { tableMetaForDataTab } from "@/lib/tableDataTabMeta"; import { tableOpenPageLimit } from "@/lib/tableOpenPageLimit"; import { quoteTableIdentifier } from "@/lib/tableSelectSql"; import { connectionUsesDatabaseObjectTreeMode, connectionUsesSchemaExecutionContext, effectiveDatabaseTypeForConnection, metadataSchemaForConnection } from "@/lib/jdbcDialect"; -import { queryTimeoutSecsForConnection } from "@/lib/queryTimeout"; +import { frontendQueryTimeoutSecsForSql, queryTimeoutSecsForConnection } from "@/lib/queryTimeout"; import { sortDataGridRows, type DataGridSortDirection } from "@/lib/dataGridSort"; import { normalizeResultPageSize } from "@/lib/paginationPageSize"; import { splitSqlStatementRanges } from "@/lib/sqlStatementRanges"; @@ -2135,7 +2135,7 @@ export const useQueryStore = defineStore("query", () => { } const executionSchema = connectionUsesSchemaExecutionContext(conn) ? tab.schema || tab.database : tab.mode === "data" || connectionUsesDatabaseObjectTreeMode(conn) ? undefined : tab.schema; - const frontendTimeoutSecs = Math.max(queryTimeoutSecs * 2, 60); + const frontendTimeoutSecs = frontendQueryTimeoutSecsForSql(sqlToExecute, effectiveDbType, queryTimeoutSecs); const sourceLabelDatabase = tab.database || conn?.database; let executionPromise: Promise; @@ -2174,7 +2174,7 @@ export const useQueryStore = defineStore("query", () => { }); executionPromise = api.executeMulti(tab.connectionId, tab.database, sqlToExecute, executionSchema, executionId, executionOptions); } - const results = annotateQueryResultSources(markQueryResultsRowsRaw(await withFrontendQueryTimeout(executionPromise, queryTimeoutSecs === 0 ? 0 : frontendTimeoutSecs, t("editor.queryTimeoutError", { seconds: frontendTimeoutSecs }))), queryBaseSql, sourceLabelDatabase, effectiveDbType); + const results = annotateQueryResultSources(markQueryResultsRowsRaw(await withFrontendQueryTimeout(executionPromise, frontendTimeoutSecs, t("editor.queryTimeoutError", { seconds: frontendTimeoutSecs }))), queryBaseSql, sourceLabelDatabase, effectiveDbType); console.info("[DBX][executeTabSql:execute-multi:done]", { traceId, resultCount: results.length, diff --git a/packages/app-tests/queryTimeout.test.ts b/packages/app-tests/queryTimeout.test.ts new file mode 100644 index 0000000000..955cbb5f7b --- /dev/null +++ b/packages/app-tests/queryTimeout.test.ts @@ -0,0 +1,18 @@ +import { strict as assert } from "node:assert"; +import { test } from "vitest"; +import { DEFAULT_QUERY_TIMEOUT_SECS, frontendQueryTimeoutSecsForSql, queryTimeoutSecsForConnection } from "../../apps/desktop/src/lib/queryTimeout.ts"; + +test("queryTimeoutSecsForConnection falls back to the default timeout", () => { + assert.equal(queryTimeoutSecsForConnection(undefined), DEFAULT_QUERY_TIMEOUT_SECS); + assert.equal(queryTimeoutSecsForConnection({ query_timeout_secs: -1 }), DEFAULT_QUERY_TIMEOUT_SECS); + assert.equal(queryTimeoutSecsForConnection({ query_timeout_secs: 0 }), 0); + assert.equal(queryTimeoutSecsForConnection({ query_timeout_secs: 15 }), 15); +}); + +test("frontend query timeout scales with SQL statement count", () => { + assert.equal(frontendQueryTimeoutSecsForSql("INSERT INTO users VALUES (1)", "mysql", 30), 60); + assert.equal(frontendQueryTimeoutSecsForSql("INSERT INTO users VALUES (1); INSERT INTO users VALUES (2);", "mysql", 30), 120); + assert.equal(frontendQueryTimeoutSecsForSql("INSERT INTO users VALUES (1); INSERT INTO users VALUES (2); INSERT INTO users VALUES (3);", "mysql", 10), 180); + assert.equal(frontendQueryTimeoutSecsForSql("/* prep */\nINSERT INTO users VALUES (1);\n-- keep batching\nINSERT INTO users VALUES (2);", "mysql", 30), 120); + assert.equal(frontendQueryTimeoutSecsForSql("INSERT INTO users VALUES (1); INSERT INTO users VALUES (2);", "mysql", 0), 0); +});