fix(connection): invalidate data-tab metadata on disconnect/reconnect
This commit is contained in:
1 parent
b537c4b891
commit
78aab1e5ed
15 files changed
+804
-31
No files matched your search
@@ -39,9 +39,10 @@ import { supportsClearableQuerySchema } from "@/lib/database/databaseFeatureSupp
|
||||
import { canInsertTableRows, canUseKeylessRowPredicate, DBX_ROWID_COLUMN, editablePrimaryKeys, usesSyntheticRowIdKey } from "@/lib/table/tableEditing";
|
||||
import { TABLE_DATA_EXPORT_PAGE_SIZE } from "@/lib/table/tableDataExport";
|
||||
import { tableMetaForDataTab } from "@/lib/table/tableDataTabMeta";
|
||||
import { isDataTabMetadataLifecycleStale } from "@/lib/sidebar/dataTabOpenPolicy";
|
||||
import { dataTabExecutionDatabase } from "@/lib/table/dataTabExecutionDatabase";
|
||||
import { tableOpenPageLimit } from "@/lib/table/tableOpenPageLimit";
|
||||
import { getCachedTableMetadata, loadTableColumns, loadTableIndexes, loadTableMetadata, type TableMetadataRequest } from "@/lib/metadata/tableMetadataCache";
|
||||
import { getCachedTableMetadata, loadTableColumns, loadTableIndexes, loadTableMetadata, tableMetadataToDataTabMeta, type TableMetadataRequest } from "@/lib/metadata/tableMetadataCache";
|
||||
import { MetadataTaskLimiter } from "@/lib/metadata/metadataTaskLimiter";
|
||||
import { buildTableSelectSql, quoteTableDataIdentifier } from "@/lib/table/tableSelectSql";
|
||||
import { connectionObjectTreeNodeSchema, connectionQueryExecutionSchema, connectionUsesDatabaseObjectTreeMode, effectiveDatabaseTypeForConnection, gaussdbCountQueryDopHint, metadataSchemaForConnection } from "@/lib/database/jdbcDialect";
|
||||
@@ -2819,26 +2820,55 @@ export const useQueryStore = defineStore("query", () => {
|
||||
async function refreshDataTabInternal(id: string, options?: { supersedeBusy?: boolean; propagateBuildError?: boolean }): Promise<boolean> {
|
||||
const tab = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!tab || tab.mode !== "data" || (tab.isExecuting && !options?.supersedeBusy)) return false;
|
||||
const tableMeta = tableMetaForDataTab(tab);
|
||||
if (!tableMeta?.tableName) return false;
|
||||
|
||||
const connStore = useConnectionStore();
|
||||
const conn = connStore.getConfig(tab.connectionId);
|
||||
const effectiveDbType = effectiveDatabaseTypeForConnection(conn);
|
||||
const identifierQuote = connStore.connectionIdentifierQuote?.(tab.connectionId);
|
||||
clearInvalidDataTabSortState(tab, tableMeta.columns);
|
||||
const primaryKeys = tab.tableMeta ? tab.tableMeta.primaryKeys : tableMeta.primaryKeys;
|
||||
const sortOrder = tab.resultSortColumn && tab.resultSortDirection ? `${quoteTableDataIdentifier(effectiveDbType, tab.resultSortColumn, identifierQuote)} ${tab.resultSortDirection.toUpperCase()}` : undefined;
|
||||
const orderBy = tab.orderByInput?.trim() || sortOrder;
|
||||
const limit = tab.resultPageLimit ?? tableOpenPageLimit(settingsStore.editorSettings.tableOpenPageSize);
|
||||
const offset = tab.resultPageOffset ?? 0;
|
||||
const useDriverRowOffset = conn?.db_type === "jdbc" && effectiveDbType === "iris";
|
||||
const refreshPreparationId = uuid();
|
||||
|
||||
// Reserve the tab synchronously before SQL construction yields so repeated
|
||||
// refresh requests cannot build and execute duplicate queries.
|
||||
setExecutingWithId(tab.id, refreshPreparationId);
|
||||
try {
|
||||
let tableMeta = tableMetaForDataTab(tab);
|
||||
if (!tableMeta?.tableName) return false;
|
||||
|
||||
// 生命周期代次校验:disconnect / 关库 / 死池重连后的首次刷新必须先从
|
||||
// 新连接源头重建结构,否则旧显式列列表会生成错误 SELECT(issue #6623 /
|
||||
// PR #6640 review blocker 2)。reload 路径不读 tableMetaUpdatedAt 风干
|
||||
// 判定、只读 tableMeta 本身,因此在这里显式强制重建。
|
||||
const connectionGeneration = connStore.metadataGenerationFor(tab.connectionId, tab.database);
|
||||
if (isDataTabMetadataLifecycleStale(tab, connectionGeneration)) {
|
||||
const metadataGenerationAtStart = connectionGeneration;
|
||||
const reloadedMetadata = await loadTableMetadata({
|
||||
connectionId: tab.connectionId,
|
||||
database: tab.database,
|
||||
schema: tableMeta.schema,
|
||||
tableName: tableMeta.tableName,
|
||||
tableType: tableMeta.tableType,
|
||||
catalog: tableMeta.catalog,
|
||||
databaseType: effectiveDbType ?? conn?.db_type ?? "",
|
||||
driverProfile: conn?.driver_profile,
|
||||
force: true,
|
||||
});
|
||||
// 重建期间又跨越了一次连接生命周期边界 → 放弃本次刷新,避免旧结果
|
||||
// 二次写回 tab(PR #6640 review blocker 1 的 tab-local 半边)
|
||||
if (connStore.metadataGenerationFor(tab.connectionId, tab.database) !== metadataGenerationAtStart) return false;
|
||||
const current = tabs.value.find((candidate) => candidate.id === id);
|
||||
if (!current || current.executionId !== refreshPreparationId) return false;
|
||||
setTableMeta(tab.id, tableMetadataToDataTabMeta(reloadedMetadata.metadata, { schema: tableMeta.schema }));
|
||||
tableMeta = tableMetaForDataTab(tab) ?? tableMeta;
|
||||
}
|
||||
|
||||
clearInvalidDataTabSortState(tab, tableMeta.columns);
|
||||
const primaryKeys = tab.tableMeta ? tab.tableMeta.primaryKeys : tableMeta.primaryKeys;
|
||||
const sortOrder = tab.resultSortColumn && tab.resultSortDirection ? `${quoteTableDataIdentifier(effectiveDbType, tab.resultSortColumn, identifierQuote)} ${tab.resultSortDirection.toUpperCase()}` : undefined;
|
||||
const orderBy = tab.orderByInput?.trim() || sortOrder;
|
||||
const limit = tab.resultPageLimit ?? tableOpenPageLimit(settingsStore.editorSettings.tableOpenPageSize);
|
||||
const offset = tab.resultPageOffset ?? 0;
|
||||
const useDriverRowOffset = conn?.db_type === "jdbc" && effectiveDbType === "iris";
|
||||
|
||||
const sql = await buildTableSelectSql({
|
||||
databaseType: effectiveDbType,
|
||||
driverProfile: conn?.driver_profile,
|
||||
@@ -2913,6 +2943,21 @@ export const useQueryStore = defineStore("query", () => {
|
||||
releaseTabsWhere((tab) => tab.connectionId === connectionId && tab.database === database);
|
||||
}
|
||||
|
||||
/**
|
||||
* 连接生命周期边界(断开连接 / 关闭数据库连接 / 后端连接池失效重连)。
|
||||
* 数据标签页的 tableMeta 为展示/编辑保留(不清除 UI、主键与编辑安全门控),
|
||||
* 但清掉 freshness 戳:此后 openData 的 tab-local 暖缓存判定、激活路径的
|
||||
* stale 判定、以及网格 reload 的 metadata age 判定全部按"冷缓存"处理,
|
||||
* 即使位于 30s TTL 窗口内也会重新拉取结构(issue #6623)。
|
||||
*/
|
||||
function staleConnectionDataTabMetadata(connectionId: string, database?: string) {
|
||||
for (const tab of tabs.value) {
|
||||
if (tab.mode !== "data" || tab.connectionId !== connectionId) continue;
|
||||
if (database != null && tab.database !== database) continue;
|
||||
tab.tableMetaUpdatedAt = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
function isDatabaseOpen(connectionId: string, database: string) {
|
||||
return openDatabaseKeys.value.has(`${connectionId}\x00${database}`);
|
||||
}
|
||||
@@ -3297,6 +3342,10 @@ export const useQueryStore = defineStore("query", () => {
|
||||
const tab = tabs.value.find((t) => t.id === id);
|
||||
if (tab) {
|
||||
tab.tableMeta = meta;
|
||||
// 记录写入时的连接元数据代次:disconnect/关库/死池重连会使该代次递增,
|
||||
// 代次失配视同冷缓存,即使位于 30s TTL 窗口内也会重建结构(issue #6623 /
|
||||
// PR #6640)。同一代次内的多次写入与连接Store保持一致,无需额外入参。
|
||||
tab.tableMetaGeneration = useConnectionStore().metadataGenerationFor(tab.connectionId, tab.database) ?? 0;
|
||||
tab.tableMetaUpdatedAt = Date.now();
|
||||
if (meta.columns.length > 0) clearInvalidDataTabSortState(tab, meta.columns);
|
||||
// 只有真实元数据(columns 非空)落地才结束行标识等待;多处调用方会先写
|
||||
@@ -6255,6 +6304,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
refreshDataTabsForTable,
|
||||
releaseConnectionTabs,
|
||||
releaseDatabaseTabs,
|
||||
staleConnectionDataTabMetadata,
|
||||
isDatabaseOpen,
|
||||
openDatabaseKeys,
|
||||
rollbackConnectionTransactions,
|
||||
|
||||
Reference in new issue
Block a user