fix(desktop): scale multi-statement query timeout (#2544)

This commit is contained in:
Guoyu Su authored and GitHub committed 2026-07-04 02:19:10 +08:00
1 parent 2225343e8a
commit 3a2abf4a49
3 files changed
+31 -4

No files matched your search

+10 -1
View File
@@ -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; export const DEFAULT_QUERY_TIMEOUT_SECS = 30;
@@ -6,3 +7,11 @@ export function queryTimeoutSecsForConnection(connection?: Pick<ConnectionConfig
const value = Number(connection?.query_timeout_secs); const value = Number(connection?.query_timeout_secs);
return Number.isFinite(value) && value >= 0 ? value : DEFAULT_QUERY_TIMEOUT_SECS; return Number.isFinite(value) && value >= 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;
}
+3 -3
View File
@@ -33,7 +33,7 @@ import { tableMetaForDataTab } from "@/lib/tableDataTabMeta";
import { tableOpenPageLimit } from "@/lib/tableOpenPageLimit"; import { tableOpenPageLimit } from "@/lib/tableOpenPageLimit";
import { quoteTableIdentifier } from "@/lib/tableSelectSql"; import { quoteTableIdentifier } from "@/lib/tableSelectSql";
import { connectionUsesDatabaseObjectTreeMode, connectionUsesSchemaExecutionContext, effectiveDatabaseTypeForConnection, metadataSchemaForConnection } from "@/lib/jdbcDialect"; 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 { sortDataGridRows, type DataGridSortDirection } from "@/lib/dataGridSort";
import { normalizeResultPageSize } from "@/lib/paginationPageSize"; import { normalizeResultPageSize } from "@/lib/paginationPageSize";
import { splitSqlStatementRanges } from "@/lib/sqlStatementRanges"; 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 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; const sourceLabelDatabase = tab.database || conn?.database;
let executionPromise: Promise<QueryResult[]>; let executionPromise: Promise<QueryResult[]>;
@@ -2174,7 +2174,7 @@ export const useQueryStore = defineStore("query", () => {
}); });
executionPromise = api.executeMulti(tab.connectionId, tab.database, sqlToExecute, executionSchema, executionId, executionOptions); 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]", { console.info("[DBX][executeTabSql:execute-multi:done]", {
traceId, traceId,
resultCount: results.length, resultCount: results.length,
+18
View File
@@ -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);
});