fix(redis): delete whole subtree by prefix on group delete
This commit is contained in:
27 files changed
+278
-7
No files matched your search
@@ -22,6 +22,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
toast: vi.fn(),
|
||||
@@ -52,6 +53,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
|
||||
@@ -24,6 +24,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
canBuildRedisFuzzyTree: vi.fn((loadedKeyCount: number) => loadedKeyCount <= 200_000),
|
||||
@@ -65,6 +66,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
@@ -500,6 +502,7 @@ function resetApiMocks() {
|
||||
mocks.redisCheckJsonModule.mockResolvedValue(true);
|
||||
mocks.redisDeleteKey.mockResolvedValue(undefined);
|
||||
mocks.redisDeleteKeys.mockResolvedValue(0);
|
||||
mocks.redisDeleteKeysByPattern.mockResolvedValue(0);
|
||||
mocks.redisExecuteCommand.mockResolvedValue({ value: "OK" });
|
||||
mocks.saveHistory.mockResolvedValue(undefined);
|
||||
mocks.listRedisCompletionCommandDocs.mockResolvedValue(completionCommands);
|
||||
@@ -523,6 +526,8 @@ function mountBrowser(withDeleteDetails = false) {
|
||||
en: {
|
||||
redis: {
|
||||
deleteGroupDetails: withDeleteDetails ? "{target}\n{count} keys" : "redis.deleteGroupDetails",
|
||||
deleteGroupSubtreeDetails: "{target}\nall {count}",
|
||||
deleteGroupSubtreeSuccess: "deleted {count}",
|
||||
keys: "{count} keys",
|
||||
batchExpirySelected: "redis.batchExpirySelected",
|
||||
batchExpirySuccess: "applied {count}",
|
||||
@@ -635,6 +640,11 @@ function groupRow(label: string): HTMLElement {
|
||||
return row!;
|
||||
}
|
||||
|
||||
function groupRowOrUndefined(label: string): HTMLElement | undefined {
|
||||
const labelElement = Array.from(document.querySelectorAll<HTMLElement>(".dbx-editor-font-family")).find((element) => element.textContent === label);
|
||||
return labelElement?.closest<HTMLElement>(".group") ?? undefined;
|
||||
}
|
||||
|
||||
function redisCheckboxes(): HTMLElement[] {
|
||||
return Array.from(document.querySelectorAll<HTMLElement>('input[type="checkbox"]'));
|
||||
}
|
||||
@@ -1578,6 +1588,37 @@ describe("RedisKeyBrowser fuzzy key hierarchy", () => {
|
||||
expect(document.body.textContent).not.toContain("session:current");
|
||||
});
|
||||
|
||||
it("deletes every key under a group prefix instead of only the loaded rows (#10164)", async () => {
|
||||
const loaded = [
|
||||
{ key_display: "MCP:AAA:1", key_raw: btoa("MCP:AAA:1"), key_type: "string", ttl: -1 },
|
||||
{ key_display: "MCP:AAA:2", key_raw: btoa("MCP:AAA:2"), key_type: "string", ttl: -1 },
|
||||
{ key_display: "OTHER:key1", key_raw: btoa("OTHER:key1"), key_type: "string", ttl: -1 },
|
||||
];
|
||||
mocks.redisScanKeysBatch.mockResolvedValue({ cursor: 0, keys: loaded, total_keys: 3002 });
|
||||
mocks.redisDeleteKeysByPattern.mockResolvedValue(3001);
|
||||
mountBrowser();
|
||||
await settle();
|
||||
|
||||
const groupDelete = groupRow("MCP").querySelector<HTMLButtonElement>('button[title="redis.deleteGroup"]');
|
||||
expect(groupDelete, "group delete button").not.toBeNull();
|
||||
groupDelete!.click();
|
||||
await settle();
|
||||
|
||||
expect(mocks.redisDeleteKeys).not.toHaveBeenCalled();
|
||||
expect(requiredElement<HTMLElement>("[data-test-danger-details]").textContent).toContain("MCP");
|
||||
requiredElement<HTMLButtonElement>("[data-test-danger-confirm]").click();
|
||||
await settle();
|
||||
|
||||
// 整个前缀在服务端删除(未加载的子键也在内),不再按已加载行逐个删
|
||||
expect(mocks.redisDeleteKeysByPattern).toHaveBeenCalledWith("connection", 0, "MCP:*");
|
||||
expect(mocks.redisDeleteKeys).not.toHaveBeenCalled();
|
||||
// 整个 MCP 分组消失,前缀之外的分组保留
|
||||
expect(groupRowOrUndefined("MCP")).toBeUndefined();
|
||||
expect(groupRow("OTHER")).toBeDefined();
|
||||
expect(mocks.updateRedisDbKeyStats).toHaveBeenCalledWith("connection", 0, { loaded: 1, totalDelta: -3001 });
|
||||
expect(mocks.toast).toHaveBeenCalledWith("deleted 3001", 3000);
|
||||
});
|
||||
|
||||
it("preserves the cursor and finds a sparse fuzzy match after a bounded continuation", async () => {
|
||||
mocks.redisScanPageSize = 1_000;
|
||||
mountBrowser();
|
||||
|
||||
@@ -31,6 +31,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
toast: vi.fn(),
|
||||
@@ -61,6 +62,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
|
||||
@@ -22,6 +22,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
toast: vi.fn(),
|
||||
@@ -51,6 +52,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
|
||||
@@ -22,6 +22,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
toast: vi.fn(),
|
||||
@@ -51,6 +52,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
|
||||
@@ -22,6 +22,7 @@ const mocks = vi.hoisted(() => ({
|
||||
redisCheckJsonModule: vi.fn(),
|
||||
redisDeleteKey: vi.fn(),
|
||||
redisDeleteKeys: vi.fn(),
|
||||
redisDeleteKeysByPattern: vi.fn(),
|
||||
redisExecuteCommand: vi.fn(),
|
||||
saveHistory: vi.fn(),
|
||||
toast: vi.fn(),
|
||||
@@ -51,6 +52,7 @@ vi.mock("@/lib/backend/api", () => ({
|
||||
redisCheckJsonModule: mocks.redisCheckJsonModule,
|
||||
redisDeleteKey: mocks.redisDeleteKey,
|
||||
redisDeleteKeys: mocks.redisDeleteKeys,
|
||||
redisDeleteKeysByPattern: mocks.redisDeleteKeysByPattern,
|
||||
redisExecuteCommand: mocks.redisExecuteCommand,
|
||||
saveHistory: mocks.saveHistory,
|
||||
}));
|
||||
|
||||
@@ -191,7 +191,7 @@ const batchExpiryTtl = ref("");
|
||||
const batchExpiryExpireAt = shallowRef<CalendarDateTime | null>(null);
|
||||
/** Snapshot taken when the dialog opens so a background refresh cannot retarget the batch. */
|
||||
const batchExpiryKeyRaws = shallowRef<string[]>([]);
|
||||
const pendingDanger = ref<{ kind: "delete-keys"; title: string; keyRaws: string[]; loadedSearchResults: boolean } | { kind: "command"; command: string } | null>(null);
|
||||
const pendingDanger = ref<{ kind: "delete-keys"; title: string; keyRaws: string[]; loadedSearchResults: boolean } | { kind: "delete-group"; title: string; pattern: string; groupId: string; loadedCount: number } | { kind: "command"; command: string } | null>(null);
|
||||
const showDangerConfirm = ref(false);
|
||||
const commandText = ref("");
|
||||
const commandRunning = ref(false);
|
||||
@@ -424,6 +424,14 @@ const dangerDetails = computed(() => {
|
||||
count: pendingDanger.value.keyRaws.length,
|
||||
});
|
||||
}
|
||||
if (pendingDanger.value.kind === "delete-group") {
|
||||
// 分组删除按前缀在服务端扫全量,未加载的子键也会一起删除,因此这里
|
||||
// 只能把已加载数量作为参考,不能像按 key 删除那样当作删除总数。
|
||||
return t("redis.deleteGroupSubtreeDetails", {
|
||||
target: pendingDanger.value.title,
|
||||
count: pendingDanger.value.loadedCount,
|
||||
});
|
||||
}
|
||||
return pendingDanger.value.command;
|
||||
});
|
||||
const dangerConfirmLabel = computed(() => {
|
||||
@@ -1680,13 +1688,15 @@ function requestBatchDelete() {
|
||||
function requestGroupDelete(node: RedisKeyTreeNode, event?: Event) {
|
||||
event?.stopPropagation();
|
||||
if (node.kind !== "group" || selectionBusy.value) return;
|
||||
const keyRaws = collectRedisGroupKeyRaws(node);
|
||||
if (keyRaws.length === 0) return;
|
||||
// 一个分组是键名前缀:树里只持有已扫描到的那部分子键,按已加载行删除会
|
||||
// 留下一部分键(#10164)。这里改为删除该前缀下的全部键。
|
||||
const pattern = redisGroupSubtreePattern(node.pathSegments, redisKeySeparator.value);
|
||||
pendingDanger.value = {
|
||||
kind: "delete-keys",
|
||||
kind: "delete-group",
|
||||
title: node.pathSegments.join(redisKeySeparator.value),
|
||||
keyRaws,
|
||||
loadedSearchResults: false,
|
||||
pattern,
|
||||
groupId: node.id,
|
||||
loadedCount: collectRedisGroupKeyRaws(node).length,
|
||||
};
|
||||
showDangerConfirm.value = true;
|
||||
}
|
||||
@@ -1777,6 +1787,50 @@ function resetLoadedKeys() {
|
||||
lastTotalKeys.value = 0;
|
||||
}
|
||||
|
||||
async function deleteGroupSubtree(pattern: string, groupId: string) {
|
||||
if (deletingKeys.value) return;
|
||||
|
||||
// Ignore a late SCAN page while an explicit mutation changes this result set.
|
||||
invalidateScanRequests();
|
||||
fetchAllStopRequested.value = true;
|
||||
deletingKeys.value = true;
|
||||
try {
|
||||
const deletedCount = await api.redisDeleteKeysByPattern(props.connectionId, props.db, pattern);
|
||||
// 删除作用于服务端整个前缀,本地只保留匹配该前缀之外的行;未加载的子键
|
||||
// 也已随服务端删除一起消失,因此不需要再补扫。
|
||||
const matches = createRedisKeyPatternMatcher(pattern);
|
||||
const removed = flatKeys.value.filter((key) => matches(key.key_display, key.key_raw));
|
||||
for (const key of removed) {
|
||||
loadedKeyRaws.delete(key.key_raw);
|
||||
ttlObservedAtByRaw.delete(key.key_raw);
|
||||
positiveTtlKeyRaws.delete(key.key_raw);
|
||||
}
|
||||
replaceFlatKeyRecords(flatKeys.value.filter((key) => !matches(key.key_display, key.key_raw)));
|
||||
if (selectedKeyRaw.value && removed.some((key) => key.key_raw === selectedKeyRaw.value)) {
|
||||
selectedKeyRaw.value = null;
|
||||
}
|
||||
resetCheckedKeys();
|
||||
// 该子树已被整段删除,旧的补扫游标/已扫尽标记对新键不再成立
|
||||
subtreePendingGroupCursors.delete(groupId);
|
||||
subtreeFilledGroupIds.delete(groupId);
|
||||
rebuildTree(false);
|
||||
connectionStore.updateRedisDbKeyStats(props.connectionId, props.db, {
|
||||
loaded: isSearchMode.value ? undefined : flatKeys.value.length,
|
||||
totalDelta: -deletedCount,
|
||||
});
|
||||
toast(t("redis.deleteGroupSubtreeSuccess", { count: deletedCount }), 3000);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
toast(message, 5000);
|
||||
// A partial scan may already have deleted keys before the error surfaced.
|
||||
// Reload instead of leaving a potentially stale result in the tree.
|
||||
if (redisBrowserIsActive) await loadKeys();
|
||||
else reloadKeysOnActivation = true;
|
||||
} finally {
|
||||
deletingKeys.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function deleteKeyRaws(keys: string[]) {
|
||||
const uniqueKeys = [...new Set(keys)];
|
||||
if (uniqueKeys.length === 0 || deletingKeys.value) return;
|
||||
@@ -2395,6 +2449,10 @@ async function applyDangerAction() {
|
||||
await deleteKeyRaws(pending.keyRaws);
|
||||
pendingDanger.value = null;
|
||||
showDangerConfirm.value = false;
|
||||
} else if (pending.kind === "delete-group") {
|
||||
await deleteGroupSubtree(pending.pattern, pending.groupId);
|
||||
pendingDanger.value = null;
|
||||
showDangerConfirm.value = false;
|
||||
} else {
|
||||
pendingDanger.value = null;
|
||||
showDangerConfirm.value = false;
|
||||
@@ -3640,7 +3698,7 @@ defineExpose({ focusSearch, insertCommand, executeCommand: executeAiCommand });
|
||||
</Pane>
|
||||
</Splitpanes>
|
||||
|
||||
<DangerConfirmDialog v-model:open="showDangerConfirm" :message="dangerMessage" :details="dangerDetails" :confirm-label="dangerConfirmLabel" :loading="deletingKeys" :close-on-confirm="pendingDanger?.kind !== 'delete-keys'" @confirm="applyDangerAction" />
|
||||
<DangerConfirmDialog v-model:open="showDangerConfirm" :message="dangerMessage" :details="dangerDetails" :confirm-label="dangerConfirmLabel" :loading="deletingKeys" :close-on-confirm="pendingDanger?.kind === 'delete-keys' || pendingDanger?.kind === 'delete-group'" @confirm="applyDangerAction" />
|
||||
|
||||
<Dialog :open="showBatchExpiryDialog" @update:open="onBatchExpiryDialogOpenChange">
|
||||
<DialogContent class="sm:max-w-[420px]">
|
||||
|
||||
Reference in new issue
Block a user