Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(export): make table export cancelable during count and in UI

t8y24cab7abf831f
diff --git a/apps/desktop/src/composables/useExportTracker.ts b/apps/desktop/src/composables/useExportTracker.ts
index e8a3965015..62ebff389c 100644
--- a/apps/desktop/src/composables/useExportTracker.ts
+++ b/apps/desktop/src/composables/useExportTracker.ts
@@ -690,7 +690,8 @@ export function useExportTracker() {
task.tableName = progress.tableName || task.tableName;
task.rowsExported = progress.rowsExported;
task.totalRows = progress.totalRows;
- task.status = normalizeExportStatus(progress.status);
+ const nextStatus = normalizeExportStatus(progress.status);
+ task.status = task.status === "Cancelling" && (nextStatus === "Running" || nextStatus === "Writing") ? "Cancelling" : nextStatus;
task.errorMessage = progress.errorMessage || null;
if (task.status === "Done" || task.status === "Error" || task.status === "Cancelled") finishExportTask(task);
}
@@ -720,6 +721,12 @@ export function useExportTracker() {
task.preparing = false;
}
+ function markTableExportTaskCancelling(exportId: string) {
+ const task = taskMap.get(exportId);
+ if (!task || task.kind !== "table-export" || task.status === "Done" || task.status === "Error" || task.status === "Cancelled") return;
+ task.status = "Cancelling";
+ }
+
function restoreDatabaseExportTaskRunning(exportId: string) {
const task = taskMap.get(exportId);
if (task?.kind === "database-export" && task.status === "Cancelling") task.status = "Running";
@@ -852,6 +859,7 @@ export function useExportTracker() {
} else if (task?.kind === "data-transfer") {
await api.cancelTransfer(exportId);
} else {
+ markTableExportTaskCancelling(exportId);
await api.cancelTableExport(exportId);
}
} catch {
diff --git a/crates/dbx-core/src/data/table_export.rs b/crates/dbx-core/src/data/table_export.rs
index 65ee4273cb..796266479a 100644
--- a/crates/dbx-core/src/data/table_export.rs
+++ b/crates/dbx-core/src/data/table_export.rs
@@ -690,7 +690,13 @@ async fn execute_table_export_count(
cancel_token: CancellationToken,
) -> Result<QueryResult, String> {
if table_export_cursor_kind(state, pool_key).await != Some(TableExportCursorKind::ExternalDriver) {
- return execute_read_on_pool(state, pool_key, sql).await;
+ // execute_read_on_pool 不接受取消令牌;用 select! 让导出在取消时不必等待大表
+ // COUNT(*) 跑完(否则点“停止”在 COUNT 阶段毫无反应)。取消时返回 Err,调用方
+ // 会将其视作 total_rows=None 并继续,由后续 is_export_cancelled 收尾为已取消。
+ return tokio::select! {
+ result = execute_read_on_pool(state, pool_key, sql) => result,
+ _ = cancel_token.cancelled() => Err("table export count cancelled".to_string()),
+ };
}
let timeout_secs = table_export_query_timeout_secs(state, pool_key).await;