GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-07-30 02:08:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(query-editor): 修复结果集阻塞与未知总数分页误导

Browse Source 
- 为查询结果定位元数据探测增加软超时降级，避免租户元数据卡死阻塞主查询结果渲染
- 将未知总数分页切换为顺序翻页模式，并修正文案仅在真实统计时显示正在统计中
- 补充查询结果与分页回归测试，覆盖元数据超时和 legacy 未知总数分页场景
This commit is contained in:
tianqijiuyun-latiao
2026-06-24 10:47:37 +08:00
parent 1aab48783d
commit 7dab6f2e33
8 changed files with 202 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/components/queryEditor/QueryEditorHelpers.ts
View File

@@ -25,8 +25,30 @@ export type CompletionTriggerMeta = {dbName: string, triggerName: string, tableN
export type CompletionRoutineMeta = {dbName: string, routineName: string, routineType: string, schemaName?: string};
export const QUERY_LOCATOR_ALIAS_PREFIX = '__gonavi_locator_';
const QUERY_LOCATOR_METADATA_TIMEOUT_MS = 1500;
const SQLSERVER_MESSAGE_PREFIX_RE = /^\s*mssql:/i;
const withSoftTimeout = <T,>(promise: Promise<T>, fallback: () => T, timeoutMs = QUERY_LOCATOR_METADATA_TIMEOUT_MS): Promise<T> => {
if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || typeof globalThis.setTimeout !== 'function') {
return promise.catch(() => fallback());
}
return new Promise<T>((resolve) => {
let settled = false;
const finish = (value: T) => {
if (settled) return;
settled = true;
globalThis.clearTimeout(timerId);
resolve(value);
};
const timerId = globalThis.setTimeout(() => {
finish(fallback());
}, timeoutMs);
promise
.then((value) => finish(value))
.catch(() => finish(fallback()));
});
};
const trimBoundaryBlankEntries = (entries: string[]): string[] => {
let start = 0;
let end = entries.length;
@@ -2059,9 +2081,15 @@ export const resolveQueryLocatorPlan = async ({
try {
const [resCols, resIndexes] = await Promise.all([
DBGetColumns(buildRpcConnectionConfig(config) as any, tableRef.metadataDbName, tableRef.metadataTableName),
DBGetIndexes(buildRpcConnectionConfig(config) as any, tableRef.metadataDbName, tableRef.metadataTableName)
.catch((error: any) => ({ success: false, message: String(error?.message || error || 'Failed to load indexes'), data: [] })),
withSoftTimeout(
DBGetColumns(buildRpcConnectionConfig(config) as any, tableRef.metadataDbName, tableRef.metadataTableName),
() => ({ success: false, message: 'Timed out while loading columns', data: [] }),
),
withSoftTimeout(
DBGetIndexes(buildRpcConnectionConfig(config) as any, tableRef.metadataDbName, tableRef.metadataTableName)
.catch((error: any) => ({ success: false, message: String(error?.message || error || 'Failed to load indexes'), data: [] })),
() => ({ success: false, message: 'Timed out while loading indexes', data: [] }),
),
]);
if (!resCols?.success || !Array.isArray(resCols.data)) {
const reason = translate('query_editor.message.read_only_table_locator_metadata_unavailable', {