From d7e52779c30f60bde69d5639c69f471aadc2c9d1 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 22 Jun 2026 11:49:01 +0800 Subject: [PATCH] fix(data): refresh table metadata lazily --- .../src/composables/useDataGridActions.ts | 61 +++++++++++++++---- apps/desktop/src/stores/queryStore.ts | 15 ++++- apps/desktop/src/types/database.ts | 1 + 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/apps/desktop/src/composables/useDataGridActions.ts b/apps/desktop/src/composables/useDataGridActions.ts index 9ebe579e25..fdfd93056e 100644 --- a/apps/desktop/src/composables/useDataGridActions.ts +++ b/apps/desktop/src/composables/useDataGridActions.ts @@ -10,6 +10,9 @@ import * as api from "@/lib/api"; import type { QueryTab } from "@/types/database"; import { useToast } from "@/composables/useToast"; import { connectionObjectTreeQuerySchema, effectiveDatabaseTypeForConnection } from "@/lib/jdbcDialect"; +import { uuid } from "@/lib/utils"; + +const DATA_TAB_METADATA_TTL_MS = 30_000; export function useDataGridActions(activeTab: ComputedRef) { const { t } = useI18n(); @@ -46,15 +49,19 @@ export function useDataGridActions(activeTab: ComputedRef) }); } - async function refreshDataTabTableMeta(tab: QueryTab): Promise { + async function refreshDataTabTableMeta(tab: QueryTab, trace?: { traceId: string; elapsed: () => string }): Promise { if (tab.mode !== "data" || !tab.connectionId || !tab.database) return; const tableMeta = tableMetaForDataTab(tab); if (!tableMeta?.tableName) return; + console.info("[DBX][reloadData:metadata:ensure-connected:start]", { traceId: trace?.traceId, elapsed: trace?.elapsed() }); await connectionStore.ensureConnected(tab.connectionId); + console.info("[DBX][reloadData:metadata:ensure-connected:done]", { traceId: trace?.traceId, elapsed: trace?.elapsed() }); const config = connectionStore.getConfig(tab.connectionId); const querySchema = connectionObjectTreeQuerySchema(config, tab.database, tableMeta.schema); + console.info("[DBX][reloadData:metadata:get-columns:start]", { traceId: trace?.traceId, elapsed: trace?.elapsed(), schema: querySchema, table: tableMeta.tableName }); const columns = await api.getColumns(tab.connectionId, tab.database, querySchema, tableMeta.tableName); + console.info("[DBX][reloadData:metadata:get-columns:done]", { traceId: trace?.traceId, elapsed: trace?.elapsed(), columnCount: columns.length }); const primaryKeys = editablePrimaryKeys(effectiveDatabaseTypeForConnection(config), columns, tableMeta.tableType); queryStore.setTableMeta(tab.id, { schema: tableMeta.schema, @@ -75,21 +82,53 @@ export function useDataGridActions(activeTab: ComputedRef) async function onReloadData(sql?: string, _searchText?: string, whereInput?: string, orderBy?: string, limit?: number, offset?: number) { const tab = activeTab.value; if (!tab) return; + const traceId = uuid().slice(0, 8); + const startedAt = performance.now(); + const elapsed = () => `${Math.round(performance.now() - startedAt)}ms`; if (tab.mode === "data" && tableMetaForDataTab(tab)) { tab.whereInput = whereInput ?? ""; const pageLimit = limit ?? settingsStore.editorSettings.pageSize; const pageOffset = offset ?? 0; - try { - await refreshDataTabTableMeta(tab); - } catch (e: any) { - toast(e?.message || String(e), 5000); - } - const nextSql = await buildTableSql(tab, { whereInput, orderBy, limit: pageLimit, offset: pageOffset }); - queryStore.updateSql(tab.id, nextSql); - await queryStore.executeTabSql(tab.id, nextSql, { - pagination: { limit: pageLimit, offset: pageOffset }, - preserveResultDuringExecution: true, + console.info("[DBX][reloadData:start]", { + traceId, + tabId: tab.id, + connectionId: tab.connectionId, + database: tab.database, + table: tableMetaForDataTab(tab)?.tableName, + elapsed: elapsed(), }); + queryStore.setExecuting(tab.id, true); + const tableMeta = tableMetaForDataTab(tab); + const metadataAgeMs = tab.tableMetaUpdatedAt ? Date.now() - tab.tableMetaUpdatedAt : Number.POSITIVE_INFINITY; + const shouldRefreshMetadata = !tableMeta?.columns.length || metadataAgeMs > DATA_TAB_METADATA_TTL_MS; + if (shouldRefreshMetadata) { + try { + console.info("[DBX][reloadData:metadata:start]", { traceId, elapsed: elapsed(), reason: tableMeta?.columns.length ? "stale" : "missing", metadataAgeMs }); + await refreshDataTabTableMeta(tab, { traceId, elapsed }); + console.info("[DBX][reloadData:metadata:done]", { traceId, elapsed: elapsed() }); + } catch (e: any) { + console.warn("[DBX][reloadData:metadata:error]", { traceId, elapsed: elapsed(), error: e }); + toast(e?.message || String(e), 5000); + } + } else { + console.info("[DBX][reloadData:metadata:skip]", { traceId, elapsed: elapsed(), columnCount: tableMeta.columns.length, metadataAgeMs }); + } + try { + console.info("[DBX][reloadData:build-sql:start]", { traceId, elapsed: elapsed() }); + const nextSql = await buildTableSql(tab, { whereInput, orderBy, limit: pageLimit, offset: pageOffset }); + console.info("[DBX][reloadData:build-sql:done]", { traceId, elapsed: elapsed() }); + queryStore.updateSql(tab.id, nextSql); + console.info("[DBX][reloadData:execute:start]", { traceId, elapsed: elapsed() }); + await queryStore.executeTabSql(tab.id, nextSql, { + pagination: { limit: pageLimit, offset: pageOffset }, + preserveResultDuringExecution: true, + }); + console.info("[DBX][reloadData:execute:done]", { traceId, elapsed: elapsed() }); + } catch (e) { + console.error("[DBX][reloadData:error]", { traceId, elapsed: elapsed(), error: e }); + queryStore.setExecuting(tab.id, false); + throw e; + } return; } if (tab.resultSortedSql) { diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts index 260e62723d..8da38dcd25 100644 --- a/apps/desktop/src/stores/queryStore.ts +++ b/apps/desktop/src/stores/queryStore.ts @@ -963,7 +963,10 @@ export const useQueryStore = defineStore("query", () => { function setTableMeta(id: string, meta: NonNullable) { const tab = tabs.value.find((t) => t.id === id); - if (tab) tab.tableMeta = meta; + if (tab) { + tab.tableMeta = meta; + tab.tableMetaUpdatedAt = Date.now(); + } } function setObjectSource(id: string, objectSource: NonNullable) { @@ -1282,13 +1285,17 @@ export const useQueryStore = defineStore("query", () => { let useAgentResultSession = false; try { const connStore = useConnectionStore(); + console.info("[DBX][executeTabSql:ensure-connected:start]", { traceId, elapsed: elapsed() }); await connStore.ensureConnected(tab.connectionId); + console.info("[DBX][executeTabSql:ensure-connected:done]", { traceId, elapsed: elapsed() }); const conn = connStore.getConfig(tab.connectionId); const effectiveDbType = effectiveDatabaseTypeForConnection(conn); const useAgentCursor = conn?.db_type === "jdbc" || supportsDatabaseFeature(conn?.db_type, "driverManagement"); const queryTimeoutSecs = queryTimeoutSecsForConnection(conn); const settingsStore = useSettingsStore(); + console.info("[DBX][executeTabSql:previous-session-close:start]", { traceId, elapsed: elapsed() }); await previousResultSessionClose; + console.info("[DBX][executeTabSql:previous-session-close:done]", { traceId, elapsed: elapsed() }); // Redis command execution — split multi-line input into individual commands if (conn?.db_type === "redis") { @@ -1547,6 +1554,12 @@ export const useQueryStore = defineStore("query", () => { timeoutSecs: queryTimeoutSecs, }; const executionSchema = connectionUsesSchemaExecutionContext(conn) ? tab.schema || tab.database : tab.mode === "data" || connectionUsesDatabaseObjectTreeMode(conn) ? undefined : tab.schema; + console.info("[DBX][executeTabSql:execute-multi:invoke]", { + traceId, + elapsed: elapsed(), + executionSchema, + optionKeys: Object.keys(executionOptions), + }); const executionPromise = api.executeMulti(tab.connectionId, tab.database, sqlToExecute, executionSchema, executionId, executionOptions); const frontendTimeoutSecs = Math.max(queryTimeoutSecs * 2, 60); const results = markQueryResultsRowsRaw(await withFrontendQueryTimeout(executionPromise, queryTimeoutSecs === 0 ? 0 : frontendTimeoutSecs, t("editor.queryTimeoutError", { seconds: frontendTimeoutSecs }))); diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts index c585065fdc..7bdf500eb4 100644 --- a/apps/desktop/src/types/database.ts +++ b/apps/desktop/src/types/database.ts @@ -570,6 +570,7 @@ export interface QueryTab { columns: ColumnInfo[]; primaryKeys: string[]; }; + tableMetaUpdatedAt?: number; tableInfoTab?: TableInfoTab; queryAnalysis?: { schema?: string;