feat(query): close individual query result and release result session
This commit is contained in:
14 files changed
+166
-1
No files matched your search
@@ -810,4 +810,74 @@ describe("queryStore multi-statement errors", () => {
|
||||
expect(tab.activeResultRunId).toBe(tab.resultRuns?.[0]?.id);
|
||||
expect(tab.result?.rows).toEqual([[1]]);
|
||||
});
|
||||
|
||||
it("does not clear a newer result while closing the previous result session", async () => {
|
||||
const pendingClose = deferred<void>();
|
||||
mocks.closeQuerySession.mockReturnValue(pendingClose.promise);
|
||||
const { useQueryStore } = await import("@/stores/queryStore");
|
||||
const store = useQueryStore();
|
||||
const tabId = store.createTab("mysql-1", "app", "Query");
|
||||
const tab = store.tabs.find((item) => item.id === tabId)!;
|
||||
tab.result = { columns: ["value"], rows: [[1]], affected_rows: 0, execution_time_ms: 1, session_id: "result-session-1" };
|
||||
tab.resultSessionId = "result-session-1";
|
||||
tab.resultClientSessionId = "result-client-1";
|
||||
|
||||
const closing = store.closeQueryResult(tabId);
|
||||
expect(tab.result).toBeUndefined();
|
||||
|
||||
tab.result = { columns: ["value"], rows: [[2]], affected_rows: 0, execution_time_ms: 1, session_id: "result-session-2" };
|
||||
tab.resultSessionId = "result-session-2";
|
||||
tab.resultClientSessionId = "result-client-2";
|
||||
pendingClose.resolve();
|
||||
|
||||
await expect(closing).resolves.toBe(true);
|
||||
expect(tab.result?.rows).toEqual([[2]]);
|
||||
expect(tab.resultSessionId).toBe("result-session-2");
|
||||
expect(tab.resultClientSessionId).toBe("result-client-2");
|
||||
});
|
||||
|
||||
it("clears every retained result run while preserving the query tab", async () => {
|
||||
const { useQueryStore } = await import("@/stores/queryStore");
|
||||
const store = useQueryStore();
|
||||
const tabId = store.createTab("mysql-1", "app", "Query");
|
||||
const tab = store.tabs.find((item) => item.id === tabId)!;
|
||||
tab.sql = "select draft";
|
||||
tab.result = { columns: ["value"], rows: [[1]], affected_rows: 0, execution_time_ms: 1, session_id: "result-session-1" };
|
||||
tab.resultSessionId = "result-session-1";
|
||||
tab.resultClientSessionId = "result-client-1";
|
||||
tab.resultAutoSave = true;
|
||||
tab.resultRuns = [
|
||||
{
|
||||
id: "run-1",
|
||||
title: "Run 1",
|
||||
sequence: 1,
|
||||
sql: "select 1",
|
||||
createdAt: 1,
|
||||
result: tab.result,
|
||||
resultSessionId: "result-session-1",
|
||||
resultClientSessionId: "result-client-1",
|
||||
},
|
||||
{
|
||||
id: "run-2",
|
||||
title: "Run 2",
|
||||
sequence: 2,
|
||||
sql: "select 2",
|
||||
createdAt: 2,
|
||||
result: { columns: ["value"], rows: [[2]], affected_rows: 0, execution_time_ms: 1, session_id: "result-session-2" },
|
||||
resultSessionId: "result-session-2",
|
||||
resultClientSessionId: "result-client-2",
|
||||
},
|
||||
];
|
||||
tab.activeResultRunId = "run-1";
|
||||
|
||||
await expect(store.clearQueryResults(tabId)).resolves.toBe(true);
|
||||
|
||||
expect(mocks.closeQuerySession).toHaveBeenCalledTimes(2);
|
||||
expect(tab.sql).toBe("select draft");
|
||||
expect(tab.resultAutoSave).toBe(true);
|
||||
expect(tab.result).toBeUndefined();
|
||||
expect(tab.results).toBeUndefined();
|
||||
expect(tab.resultRuns).toBeUndefined();
|
||||
expect(tab.activeResultRunId).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -1095,6 +1095,45 @@ export const useQueryStore = defineStore("query", () => {
|
||||
return true;
|
||||
}
|
||||
|
||||
async function closeQueryResult(id: string) {
|
||||
const tab = tabs.value.find((item) => item.id === id);
|
||||
if (!tab || tab.mode !== "query" || tab.isExecuting) return false;
|
||||
|
||||
if (tab.activeResultRunId) return removeResultRun(id, tab.activeResultRunId);
|
||||
if (!tab.result && !tab.results?.length && !tab.resultEvicted) return false;
|
||||
|
||||
const closeSession = closeResultSession(tab);
|
||||
clearResultPayload(tab);
|
||||
await closeSession;
|
||||
return true;
|
||||
}
|
||||
|
||||
async function clearQueryResults(id: string) {
|
||||
const tab = tabs.value.find((item) => item.id === id);
|
||||
if (!tab || tab.mode !== "query" || tab.isExecuting) return false;
|
||||
|
||||
const resultRuns = tab.resultRuns ?? [];
|
||||
if (!tab.result && !tab.results?.length && !tab.resultEvicted && resultRuns.length === 0) return false;
|
||||
|
||||
const closedSessionIds = new Set<string>();
|
||||
const currentSessionId = tab.resultSessionId ?? tab.result?.session_id;
|
||||
if (currentSessionId) closedSessionIds.add(currentSessionId);
|
||||
const closeOperations = [closeResultSession(tab)];
|
||||
|
||||
for (const run of resultRuns) {
|
||||
if (run.resultCacheKey) void deleteTabResultSnapshot(run.resultCacheKey);
|
||||
if (!run.resultSessionId || closedSessionIds.has(run.resultSessionId)) continue;
|
||||
closedSessionIds.add(run.resultSessionId);
|
||||
closeOperations.push(closeResultRunSession(tab, run));
|
||||
}
|
||||
|
||||
tab.resultRuns = undefined;
|
||||
tab.activeResultRunId = undefined;
|
||||
clearResultPayload(tab);
|
||||
await Promise.all(closeOperations);
|
||||
return true;
|
||||
}
|
||||
|
||||
function nextResultRunSequence(tab: QueryTab): number {
|
||||
return (tab.resultRuns?.reduce((max, run) => Math.max(max, run.sequence), 0) ?? 0) + 1;
|
||||
}
|
||||
@@ -5697,6 +5736,8 @@ export const useQueryStore = defineStore("query", () => {
|
||||
toggleResultAutoSave,
|
||||
setActiveResultRun,
|
||||
removeResultRun,
|
||||
closeQueryResult,
|
||||
clearQueryResults,
|
||||
setActiveResultIndex,
|
||||
executeCurrentTab,
|
||||
executeCurrentSql,
|
||||
|
||||
Reference in new issue
Block a user