From d452346082f4fa76a0dca527537a0672724204ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=A1=A5=E5=87=89=E4=BB=8B?= <113153113+HighBigSky@users.noreply.github.com> Date: Mon, 28 Sep 2026 13:56:02 +0800 Subject: [PATCH] fix(redis): show values for kvrocks bitmap and hyperloglog keys --- .../redis/RedisValueViewer.expiry.spec.ts | 2 +- .../RedisValueViewer.kvrocksTypes.spec.ts | 185 ++++++++++++++++++ .../src/components/redis/RedisValueViewer.vue | 55 ++++-- apps/desktop/src/i18n/locales/az.ts | 4 + apps/desktop/src/i18n/locales/en.ts | 4 + apps/desktop/src/i18n/locales/es.ts | 4 + apps/desktop/src/i18n/locales/it.ts | 4 + apps/desktop/src/i18n/locales/ja.ts | 4 + apps/desktop/src/i18n/locales/ko.ts | 4 + apps/desktop/src/i18n/locales/pt-BR.ts | 4 + apps/desktop/src/i18n/locales/ru.ts | 4 + apps/desktop/src/i18n/locales/tr.ts | 4 + apps/desktop/src/i18n/locales/zh-CN.ts | 4 + apps/desktop/src/i18n/locales/zh-TW.ts | 4 + apps/desktop/src/lib/backend/tauri.ts | 9 +- .../src/lib/redis/redisValuePresentation.ts | 5 + crates/dbx-driver-redis/src/lib.rs | 97 +++++++-- 17 files changed, 367 insertions(+), 30 deletions(-) create mode 100644 apps/desktop/src/components/redis/RedisValueViewer.kvrocksTypes.spec.ts diff --git a/apps/desktop/src/components/redis/RedisValueViewer.expiry.spec.ts b/apps/desktop/src/components/redis/RedisValueViewer.expiry.spec.ts index 81ea1bf070..52e2e382fd 100644 --- a/apps/desktop/src/components/redis/RedisValueViewer.expiry.spec.ts +++ b/apps/desktop/src/components/redis/RedisValueViewer.expiry.spec.ts @@ -130,7 +130,7 @@ function missingValue() { key_raw: "key", ttl: -2, redis_type: "none", - data: { kind: "unknown" as const }, + data: { kind: "unknown" as const, redis_type: "none" }, }; } diff --git a/apps/desktop/src/components/redis/RedisValueViewer.kvrocksTypes.spec.ts b/apps/desktop/src/components/redis/RedisValueViewer.kvrocksTypes.spec.ts new file mode 100644 index 0000000000..285b0a66d4 --- /dev/null +++ b/apps/desktop/src/components/redis/RedisValueViewer.kvrocksTypes.spec.ts @@ -0,0 +1,185 @@ +// @vitest-environment happy-dom +// +// 覆盖 kvrocks 专有类型(bitmap / hyperloglog)与未知类型的详情渲染: +// 这些类型以前会落到 unknown 分支,界面上只显示空值(issue #10406)。 + +import { createApp, defineComponent, h, nextTick } from "vue"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { createI18n } from "vue-i18n"; + +const mocks = vi.hoisted(() => ({ + redisGetValue: vi.fn(), + redisGetTtl: vi.fn(), + toast: vi.fn(), +})); + +vi.mock("@/lib/backend/api", () => ({ + redisGetValue: mocks.redisGetValue, + redisGetTtl: mocks.redisGetTtl, + redisSetTtl: vi.fn(), + redisSetExpireAt: vi.fn(), +})); + +vi.mock("@/composables/useEditorFontFamilyStyle", () => ({ + useEditorFontFamilyStyle: () => ({}), +})); + +vi.mock("@/composables/useToast", () => ({ + useToast: () => ({ toast: mocks.toast }), +})); + +vi.mock("@/lib/common/shikiJsonHighlighter", () => ({ + createShikiJsonHighlighter: vi.fn().mockResolvedValue(() => ""), +})); + +import RedisValueViewer from "./RedisValueViewer.vue"; + +const mountedApps: Array<{ unmount: () => void; host: HTMLElement }> = []; + +function createLocalStorage(): Storage { + const entries = new Map(); + return { + get length() { + return entries.size; + }, + clear() { + entries.clear(); + }, + getItem(key) { + return entries.get(key) ?? null; + }, + key(index) { + return [...entries.keys()][index] ?? null; + }, + removeItem(key) { + entries.delete(key); + }, + setItem(key, value) { + entries.set(key, String(value)); + }, + }; +} + +beforeEach(() => { + vi.clearAllMocks(); + vi.stubGlobal("localStorage", createLocalStorage()); +}); + +afterEach(() => { + for (const { unmount, host } of mountedApps.splice(0)) { + unmount(); + host.remove(); + } + vi.unstubAllGlobals(); +}); + +const testI18nMessages = { + en: { + redis: { + bitmapInfo: "kvrocks bitmap · {bits} bits set · {bytes} bytes", + hyperLogLogHint: "kvrocks HyperLogLog: PFCOUNT cardinality estimate", + unsupportedValueType: "Viewing this Redis type is not supported yet: {type}", + unsupportedValueTypeHint: "Proprietary kvrocks type", + largeStringPreviewHintUnknown: "This value is large. Only the first {loaded} is loaded, and the preview is read-only.", + }, + }, +}; + +async function settle() { + await nextTick(); + await Promise.resolve(); + await nextTick(); +} + +async function mountViewer() { + const host = document.createElement("div"); + document.body.append(host); + const app = createApp( + defineComponent({ + setup() { + return () => h(RedisValueViewer, { connectionId: "connection", db: 0, keyDisplay: "key", keyRaw: "key" }); + }, + }), + ); + app.use(createI18n({ legacy: false, locale: "en", messages: testI18nMessages, missingWarn: false, fallbackWarn: false })); + app.mount(host); + mountedApps.push({ unmount: () => app.unmount(), host }); + await settle(); +} + +describe("RedisValueViewer kvrocks 专有类型", () => { + it("按字节渲染 kvrocks 位图并显示置位数量,且不提供保存动作", async () => { + mocks.redisGetValue.mockResolvedValue({ + key_display: "bitmap-key", + key_raw: "bitmap-key", + ttl: -1, + redis_type: "bitmap", + data: { + kind: "bitmap", + content: { raw_base64: "gA==", encoding: "binary" }, + total_bytes: 1, + set_bits: 1, + }, + }); + + await mountViewer(); + + const info = document.querySelector("[data-redis-bitmap-info]"); + expect(info?.textContent).toContain("1 bits set"); + expect(info?.textContent).toContain("1 bytes"); + // 位图写回会改变服务端类型,因此详情面板不出现保存按钮 + expect(document.querySelector("[data-slot='button'][aria-label='grid.save']")).toBeNull(); + }); + + it("截断的 kvrocks 位图显示未知总量的截断提示而不是空文案", async () => { + // 超过预览上限时后端拿不到位图准确长度(total_bytes 为空),截断横幅须走未知总量文案 + mocks.redisGetValue.mockResolvedValue({ + key_display: "bitmap-key", + key_raw: "bitmap-key", + ttl: -1, + redis_type: "bitmap", + data: { + kind: "bitmap", + content: { raw_base64: "gA==", encoding: "binary" }, + truncated: true, + set_bits: 1, + }, + }); + + await mountViewer(); + + const banner = document.querySelector("[data-redis-large-string-preview]"); + expect(banner).not.toBeNull(); + expect(banner?.textContent).toContain("Only the first 1 B is loaded"); + }); + + it("HyperLogLog 类型展示 PFCOUNT 基数估计", async () => { + mocks.redisGetValue.mockResolvedValue({ + key_display: "hll-key", + key_raw: "hll-key", + ttl: -1, + redis_type: "hyperloglog", + data: { kind: "hyperloglog", count: 42 }, + }); + + await mountViewer(); + + expect(document.body.textContent).toContain("42"); + expect(document.body.textContent).toContain("PFCOUNT cardinality estimate"); + }); + + it("未知类型提示具体类型名而不是空白", async () => { + mocks.redisGetValue.mockResolvedValue({ + key_display: "ts-key", + key_raw: "ts-key", + ttl: -1, + redis_type: "timeseries", + data: { kind: "unknown", redis_type: "timeseries" }, + }); + + await mountViewer(); + + expect(document.body.textContent).toContain("timeseries"); + expect(document.body.textContent).toContain("Viewing this Redis type is not supported yet"); + }); +}); diff --git a/apps/desktop/src/components/redis/RedisValueViewer.vue b/apps/desktop/src/components/redis/RedisValueViewer.vue index e10f150a8f..1dc5bc7f97 100644 --- a/apps/desktop/src/components/redis/RedisValueViewer.vue +++ b/apps/desktop/src/components/redis/RedisValueViewer.vue @@ -441,13 +441,25 @@ async function toggleZsetSort() { const redisKind = computed(() => data.value?.data.kind ?? "unknown"); const isStringLikeKind = computed(() => redisKind.value === "string"); +/** kvrocks 的位图类型:取值链路与字符串一致,但不可编辑(SET 会把它变成字符串)。 */ +const isBitmapKind = computed(() => redisKind.value === "bitmap"); +const bitmapSetBits = computed(() => (data.value?.data.kind === "bitmap" ? data.value.data.set_bits : undefined)); +const bitmapByteLength = computed(() => (data.value?.data.kind === "bitmap" ? data.value.data.total_bytes : undefined)); +const hyperLogLogCount = computed(() => (data.value?.data.kind === "hyperloglog" ? data.value.data.count : undefined)); +const unsupportedRedisType = computed(() => (data.value?.data.kind === "unknown" ? data.value.data.redis_type : "")); const stringBlob = computed(() => { const value = data.value; if (!value) return null; - return value.data.kind === "string" ? value.data.content : null; + if (value.data.kind === "string") return value.data.content; + // kvrocks 位图用 GET 取到的字节与字符串完全一致,直接复用字符串预览链路 + return value.data.kind === "bitmap" ? value.data.content : null; }); -const isStringValueTruncated = computed(() => data.value?.data.kind === "string" && Boolean(data.value.data.truncated)); -const stringValueDetail = computed(() => (stringBlob.value ? formatRedisMemberDetail(stringBlob.value, { allowJsonText: true }) : null)); +const isStringValueTruncated = computed(() => { + const value = data.value; + if (!value) return false; + return (value.data.kind === "string" || value.data.kind === "bitmap") && Boolean(value.data.truncated); +}); +const stringValueDetail = computed(() => (stringBlob.value ? formatRedisMemberDetail(stringBlob.value, { allowJsonText: !isBitmapKind.value }) : null)); const selectedMemberDetail = computed(() => formatRedisMemberDetail(selectedMemberRaw.value, { allowJsonText: true })); // Decompression depends on the value/codec refs above, so these watchers and @@ -577,7 +589,8 @@ const memberCopyText = computed(() => memberDecodedText.value ?? detailTextForFo const redisJsonAppearance = computed(() => (isDark.value ? "dark" : "light")); const isBinaryStringValue = computed(() => Boolean(stringValueDetail.value?.binary)); const selectedMemberCanEdit = computed(() => selectedMemberContext.value?.canEdit ?? false); -const canEditCurrentStringFormat = computed(() => !isStringValueTruncated.value && Boolean(stringValueDetail.value?.editable) && (stringValueView.value === "utf8" || stringValueView.value === "json")); +// kvrocks 位图不是字符串,写回会成为字符串,因此位图详情只读 +const canEditCurrentStringFormat = computed(() => !isBitmapKind.value && !isStringValueTruncated.value && Boolean(stringValueDetail.value?.editable) && (stringValueView.value === "utf8" || stringValueView.value === "json")); const showStringEditActions = computed(() => canEditCurrentStringFormat.value); const originalStringEditValue = computed(() => (stringBlob.value ? rawRedisValueText(stringBlob.value) : "")); const stringJsonRawBaseline = ref(""); @@ -654,7 +667,8 @@ const metadataSizeLabel = computed(() => { const largeStringPreviewHint = computed(() => { const value = data.value; const loaded = stringValueDetail.value?.byteCount ?? 0; - if (!value || value.data.kind !== "string" || !value.data.truncated) return ""; + // kvrocks 位图复用字符串截断横幅;截断时后端拿不到准确长度(total_bytes 为空),走未知总量文案 + if (!value || (value.data.kind !== "string" && value.data.kind !== "bitmap") || !value.data.truncated) return ""; if (value.data.total_bytes != null) { return t("redis.largeStringPreviewHint", { loaded: formatBytes(loaded), total: formatBytes(value.data.total_bytes) }); } @@ -1572,10 +1586,13 @@ async function load(options: { background?: boolean; notifyParent?: boolean; pre memberDraftFormat.value = null; } - if (loadedValue.data.kind === "string") { + if (loadedValue.data.kind === "string" || loadedValue.data.kind === "bitmap") { + // kvrocks 位图复用字符串的预览/编码渲染链路;位图不允许 JSON 视图与编辑, + // 因为它并不是字符串(写回会改变服务端类型)。 + const allowJsonText = loadedValue.data.kind === "string"; if (loadedValue.data.truncated) stringValueCodec.value = "none"; - const detail = formatRedisMemberDetail(loadedValue.data.content, { allowJsonText: true }); - stringValueView.value = preferredRedisValueFormat(loadedValue.data.content, readPreferredRedisValueFormat(), { allowJsonText: true }); + const detail = formatRedisMemberDetail(loadedValue.data.content, { allowJsonText }); + stringValueView.value = preferredRedisValueFormat(loadedValue.data.content, readPreferredRedisValueFormat(), { allowJsonText }); stringJsonRawBaseline.value = detail.json?.formattedText ?? ""; stringJsonDraftBaseline.value = jsonDraftBaseline(stringJsonRawBaseline.value, redisJsonDecoded.value); editValue.value = stringValueView.value === "json" && detail.json ? stringJsonDraftBaseline.value : detail.rawText; @@ -2811,8 +2828,8 @@ useUpdateBlocker(() => (hasUnsavedRedisDraft.value || editingTtl.value || saving - -
+ +
{{ t("redis.codecRowLabel") }} @@ -2941,12 +2958,22 @@ useUpdateBlocker(() => (hasUnsavedRedisDraft.value || editingTtl.value || saving
{{ t("redis.binaryStringReadonlyHint") }}
+ +
+ {{ t("redis.bitmapInfo", { bits: bitmapSetBits ?? "-", bytes: bitmapByteLength ?? "-" }) }} +
+ +
+
{{ hyperLogLogCount ?? "-" }}
+
{{ t("redis.hyperLogLogHint") }}
+
+
@@ -3512,9 +3539,11 @@ useUpdateBlocker(() => (hasUnsavedRedisDraft.value || editingTtl.value || saving
- -
-
{{ formatValue(data.data) }}
+ +
+
{{ t("redis.unsupportedValueType", { type: unsupportedRedisType || "?" }) }}
+
{{ t("redis.unsupportedValueTypeHint") }}
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts index 7eeb86b574..3d0e45fc01 100644 --- a/apps/desktop/src/i18n/locales/az.ts +++ b/apps/desktop/src/i18n/locales/az.ts @@ -5451,6 +5451,10 @@ export default withEnglishFallback({ columnSize: "Ölçü", columnTTL: "TTL", binaryStringReadonlyHint: "İkilik sətir dəyərləri yalnız oxuma rejimində qaçış ardıcıllıqları ilə mətn kimi göstərilir; xam baytların redaktəsi dəstəklənmir.", + bitmapInfo: "kvrocks bit xəritəsi · {bits} bit qurulub · {bytes} bayt", + hyperLogLogHint: "kvrocks HyperLogLog: yuxarıdakı dəyər PFCOUNT kardinal təxminidir; xam məlumatlar oxuna bilməz", + unsupportedValueType: "Bu Redis növünə baxmaq hələ dəstəklənmir: {type}", + unsupportedValueTypeHint: "Bu, kvrocks uyğun serverlərin xüsusi növüdür; DBX hələ uyğunlaşdırmayıb", largeStringPreviewHint: "Bu dəyər böyükdür. Cəmi {total} həcmindən yalnız ilk {loaded} yüklənib və önbaxış yalnız oxuma üçündür.", largeStringPreviewHintUnknown: "Bu dəyər böyükdür. Yalnız ilk {loaded} yüklənib və önbaxış yalnız oxuma üçündür.", largeStringPreviewActionUnavailable: "Böyük dəyərlərin önbaxışlarını kopyalamaq, dekodlaşdırmaq və ya əlavəetmə əmrləri yaratmaq üçün istifadə etmək mümkün deyil", diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 9af14a09c8..eca09714d3 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -6046,6 +6046,10 @@ export default { columnSize: "Size", columnTTL: "TTL", binaryStringReadonlyHint: "Binary string values are shown as escaped text in read-only mode; editing raw bytes is not supported.", + bitmapInfo: "kvrocks bitmap · {bits} bits set · {bytes} bytes", + hyperLogLogHint: "kvrocks HyperLogLog: the value above is the PFCOUNT cardinality estimate; raw data is not readable", + unsupportedValueType: "Viewing this Redis type is not supported yet: {type}", + unsupportedValueTypeHint: "This is a proprietary type of kvrocks-compatible servers; DBX has not adapted it yet", largeStringPreviewHint: "This value is large. Only the first {loaded} of {total} is loaded, and the preview is read-only.", largeStringPreviewHintUnknown: "This value is large. Only the first {loaded} is loaded, and the preview is read-only.", largeStringPreviewActionUnavailable: "Large-value previews cannot be copied, decoded, or used to generate insert statements", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index 2cad4e264d..4b9bcb7703 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -5565,6 +5565,10 @@ export default withEnglishFallback({ columnSize: "Tamaño", columnTTL: "TTL", binaryStringReadonlyHint: "Los valores de cadena binaria se muestran como texto escapado en modo de solo lectura; la edición de bytes sin procesar no está disponible.", + bitmapInfo: "Bitmap de kvrocks · {bits} bits activados · {bytes} bytes", + hyperLogLogHint: "HyperLogLog de kvrocks: el valor anterior es la estimación de cardinalidad de PFCOUNT; los datos sin procesar no se pueden leer", + unsupportedValueType: "Aún no se admite ver este tipo de Redis: {type}", + unsupportedValueTypeHint: "Es un tipo propio de servidores compatibles con kvrocks; DBX aún no lo ha adaptado", largeStringPreviewHint: "Este valor es grande. Solo se cargaron los primeros {loaded} de {total}; la vista previa es de solo lectura.", largeStringPreviewHintUnknown: "Este valor es grande. Solo se cargaron los primeros {loaded}; la vista previa es de solo lectura.", largeStringPreviewActionUnavailable: "Las vistas previas de valores grandes no se pueden copiar, decodificar ni usar para generar sentencias de inserción", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index aa276f1fd0..4c329b5af9 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -5488,6 +5488,10 @@ export default withEnglishFallback({ columnSize: "Dimensione", columnTTL: "TTL", binaryStringReadonlyHint: "I valori delle stringhe binarie sono mostrati come testo con escape in modalità sola lettura; la modifica dei byte grezzi non è supportata.", + bitmapInfo: "Bitmap kvrocks · {bits} bit impostati · {bytes} byte", + hyperLogLogHint: "HyperLogLog kvrocks: il valore sopra è la stima di cardinalità di PFCOUNT; i dati grezzi non sono leggibili", + unsupportedValueType: "La visualizzazione di questo tipo Redis non è ancora supportata: {type}", + unsupportedValueTypeHint: "È un tipo proprietario dei server compatibili con kvrocks; DBX non lo supporta ancora", largeStringPreviewHint: "Questo valore è grande. Sono stati caricati solo i primi {loaded} di {total}; l'anteprima è di sola lettura.", largeStringPreviewHintUnknown: "Questo valore è grande. Sono stati caricati solo i primi {loaded}; l'anteprima è di sola lettura.", largeStringPreviewActionUnavailable: "Le anteprime di valori grandi non possono essere copiate, decodificate o usate per generare istruzioni di inserimento", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 72808b33a6..30805a7c4a 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -5515,6 +5515,10 @@ export default withEnglishFallback({ columnSize: "サイズ", columnTTL: "TTL", binaryStringReadonlyHint: "バイナリ文字列値は読み取り専用モードでエスケープテキストとして表示されます。生バイトの編集はサポートされていません。", + bitmapInfo: "kvrocks ビットマップ · セット済みビット {bits} 個 · 長さ {bytes} バイト", + hyperLogLogHint: "kvrocks HyperLogLog:上記は PFCOUNT による基数推定値で、生データは読み取れません", + unsupportedValueType: "この Redis 型の表示はまだ未対応です:{type}", + unsupportedValueTypeHint: "kvrocks など互換サーバー固有の型で、DBX はまだ対応していません", largeStringPreviewHint: "値が大きいため、{total} のうち先頭 {loaded} のみを読み込みました。プレビューは読み取り専用です。", largeStringPreviewHintUnknown: "値が大きいため、先頭 {loaded} のみを読み込みました。プレビューは読み取り専用です。", largeStringPreviewActionUnavailable: "大きな値のプレビューは、コピー、デコード、または INSERT 文の生成には使用できません", diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts index 632caa43b6..2e5b0ea312 100644 --- a/apps/desktop/src/i18n/locales/ko.ts +++ b/apps/desktop/src/i18n/locales/ko.ts @@ -5141,6 +5141,10 @@ export default withEnglishFallback({ columnSize: "크기", columnTTL: "TTL", binaryStringReadonlyHint: "바이너리 문자열 값은 읽기 전용 모드에서 이스케이프된 텍스트로 표시되며, 원시 바이트 편집은 지원되지 않습니다.", + bitmapInfo: "kvrocks 비트맵 · 설정된 비트 {bits}개 · 길이 {bytes}바이트", + hyperLogLogHint: "kvrocks HyperLogLog: 위 값은 PFCOUNT 기반 카디널리티 추정치이며 원본 데이터는 읽을 수 없습니다", + unsupportedValueType: "이 Redis 유형은 아직 표시할 수 없습니다: {type}", + unsupportedValueTypeHint: "kvrocks 등 호환 서버의 전용 유형이며 DBX가 아직 지원하지 않습니다", largeStringPreviewHint: "값이 너무 커서 전체 {total} 중 앞부분 {loaded}만 불러왔습니다. 미리 보기는 읽기 전용입니다.", largeStringPreviewHintUnknown: "값이 너무 커서 앞부분 {loaded}만 불러왔습니다. 미리 보기는 읽기 전용입니다.", largeStringPreviewActionUnavailable: "큰 값 미리 보기에서는 복사, 디코딩 또는 INSERT 문 생성을 사용할 수 없습니다", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index 7a338fdd65..54391d7f20 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -5489,6 +5489,10 @@ export default withEnglishFallback({ columnSize: "Tamanho", columnTTL: "TTL", binaryStringReadonlyHint: "Valores de string binária são exibidos como texto escapado no modo somente leitura; a edição de bytes brutos não é suportada.", + bitmapInfo: "Bitmap do kvrocks · {bits} bits definidos · {bytes} bytes", + hyperLogLogHint: "HyperLogLog do kvrocks: o valor acima é a estimativa de cardinalidade do PFCOUNT; os dados brutos não podem ser lidos", + unsupportedValueType: "Ainda não é possível visualizar este tipo do Redis: {type}", + unsupportedValueTypeHint: "É um tipo próprio de servidores compatíveis com kvrocks; o DBX ainda não o suporta", largeStringPreviewHint: "Este valor é grande. Apenas os primeiros {loaded} de {total} foram carregados; a visualização é somente leitura.", largeStringPreviewHintUnknown: "Este valor é grande. Apenas os primeiros {loaded} foram carregados; a visualização é somente leitura.", largeStringPreviewActionUnavailable: "Visualizações de valores grandes não podem ser copiadas, decodificadas ou usadas para gerar instruções de inserção", diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts index 647e76e098..e38342ed28 100644 --- a/apps/desktop/src/i18n/locales/ru.ts +++ b/apps/desktop/src/i18n/locales/ru.ts @@ -6509,6 +6509,10 @@ export default withEnglishFallback({ columnSize: "Размер", columnTTL: "TTL", binaryStringReadonlyHint: "Двоичные строковые значения отображаются как экранированный текст в режиме только для чтения; редактирование необработанных байтов не поддерживается.", + bitmapInfo: "Битовая карта kvrocks · установлено бит: {bits} · размер: {bytes} байт", + hyperLogLogHint: "HyperLogLog kvrocks: выше — оценка мощности по PFCOUNT, необработанные данные недоступны", + unsupportedValueType: "Просмотр этого типа Redis пока не поддерживается: {type}", + unsupportedValueTypeHint: "Это собственный тип серверов, совместимых с kvrocks; DBX ещё не поддерживает его", largeStringPreviewHint: "Это значение большое. Загружено только первые {loaded} из {total}, и предпросмотр доступен только для чтения.", largeStringPreviewHintUnknown: "Это значение большое. Загружено только первые {loaded}, и предпросмотр доступен только для чтения.", largeStringPreviewActionUnavailable: "Предпросмотр больших значений нельзя скопировать, декодировать или использовать для генерации INSERT-инструкций", diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts index fac3697d99..f891cc0625 100644 --- a/apps/desktop/src/i18n/locales/tr.ts +++ b/apps/desktop/src/i18n/locales/tr.ts @@ -5345,6 +5345,10 @@ export default withEnglishFallback({ columnSize: "Boyut", columnTTL: "TTL", binaryStringReadonlyHint: "İkili dize değerleri salt okunur modda kaçış karakterli metin olarak gösterilir; ham baytları düzenleme desteklenmiyor.", + bitmapInfo: "kvrocks bitmap · {bits} bit ayarlı · {bytes} bayt", + hyperLogLogHint: "kvrocks HyperLogLog: yukarıdaki değer PFCOUNT kardinalite tahminidir; ham veriler okunamaz", + unsupportedValueType: "Bu Redis türünü görüntüleme henüz desteklenmiyor: {type}", + unsupportedValueTypeHint: "Bu, kvrocks uyumlu sunuculara özgü bir türdür; DBX henüz uyarlanmadı", largeStringPreviewHint: "Bu değer büyük. {total} değerin yalnızca ilk {loaded} tanesi yüklendi ve önizleme salt okunurdur.", largeStringPreviewHintUnknown: "Bu değer büyük. Yalnızca ilk {loaded} tanesi yüklendi ve önizleme salt okunurdur.", largeStringPreviewActionUnavailable: "Büyük değer önizlemeleri kopyalanamaz, çözülemez veya insert ifadeleri üretmek için kullanılamaz", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index d51b92f260..4c509461c4 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -6019,6 +6019,10 @@ export default withEnglishFallback({ columnSize: "大小", columnTTL: "TTL", binaryStringReadonlyHint: "二进制字符串按转义文本只读展示;当前不支持直接编辑原始字节值。", + bitmapInfo: "kvrocks 位图 · 置位 {bits} 个 · 长度 {bytes} 字节", + hyperLogLogHint: "kvrocks HyperLogLog:以上为 PFCOUNT 基数估计,原始数据不可直接读取", + unsupportedValueType: "暂不支持查看该 Redis 类型:{type}", + unsupportedValueTypeHint: "这是 kvrocks 等兼容服务的专有类型,DBX 尚未适配", largeStringPreviewHint: "值过大,仅加载前 {loaded}(共 {total})。预览为只读。", largeStringPreviewHintUnknown: "值过大,仅加载前 {loaded}。预览为只读。", largeStringPreviewActionUnavailable: "大值预览不支持复制、解码或生成插入语句", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index fc8e501f36..2091a562cc 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -4802,6 +4802,10 @@ export default withEnglishFallback({ columnSize: "大小", columnTTL: "TTL", binaryStringReadonlyHint: "二進位字串值會以逸出文字唯讀顯示;不支援編輯原始位元組。", + bitmapInfo: "kvrocks 位圖 · 已設位 {bits} 個 · 長度 {bytes} 位元組", + hyperLogLogHint: "kvrocks HyperLogLog:上方為 PFCOUNT 基數估計,原始資料無法直接讀取", + unsupportedValueType: "暫不支援檢視此 Redis 類型:{type}", + unsupportedValueTypeHint: "這是 kvrocks 等相容服務的專有類型,DBX 尚未支援", largeStringPreviewHint: "值過大,僅載入前 {loaded}(共 {total})。預覽為唯讀。", largeStringPreviewHintUnknown: "值過大,僅載入前 {loaded}。預覽為唯讀。", largeStringPreviewActionUnavailable: "大值預覽不支援複製、解碼或產生插入語句", diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts index 0bdea1487f..6d51163bbb 100644 --- a/apps/desktop/src/lib/backend/tauri.ts +++ b/apps/desktop/src/lib/backend/tauri.ts @@ -3106,7 +3106,8 @@ export interface RedisKeyInfo { export interface RedisDatabaseInfo { db: number; - keys: number; + /** 该库的键数量;服务端无法给出可信数量时(如 kvrocks 未执行过 DBSIZE SCAN)缺省。 */ + keys?: number; } export type RedisBlobEncoding = "utf8" | "binary"; @@ -3210,7 +3211,11 @@ export type RedisValueData = scan_cursor?: number; } | { kind: "stream"; entries: RedisStreamEntry[]; total?: number; next_cursor?: string } - | { kind: "unknown" }; + // kvrocks 把位图/HLL 实现为独立类型(TYPE 返回 bitmap / hyperloglog), + // 这里单独建模,避免落到 unknown 后界面显示不出值。 + | { kind: "bitmap"; content: RedisBlob; total_bytes?: number; truncated?: boolean; set_bits?: number } + | { kind: "hyperloglog"; count?: number } + | { kind: "unknown"; redis_type: string }; export interface RedisValue { key_display: string; diff --git a/apps/desktop/src/lib/redis/redisValuePresentation.ts b/apps/desktop/src/lib/redis/redisValuePresentation.ts index 67e6588539..ae8df1f043 100644 --- a/apps/desktop/src/lib/redis/redisValuePresentation.ts +++ b/apps/desktop/src/lib/redis/redisValuePresentation.ts @@ -562,6 +562,8 @@ export function redisValueCollectionScanCursor(value: RedisValue): number | unde export function redisValueSize(value: RedisValue): number { switch (value.data.kind) { case "string": + // kvrocks 位图与字符串一样按字节计长度 + case "bitmap": return value.data.total_bytes ?? decodeRedisBlob(value.data.content).byteLength; case "json": return new TextEncoder().encode(redisJsonValueText(value.data)).byteLength; @@ -581,6 +583,9 @@ export function redisValuePreview(value: RedisValue): string { switch (value.data.kind) { case "string": return previewText(redisBlobRawText(value.data.content)); + case "bitmap": + // kvrocks 位图的 GET 结果就是字节内容,预览方式与字符串一致 + return previewText(redisBlobRawText(value.data.content)); case "json": return previewText(redisJsonValueText(value.data)); case "list": { diff --git a/crates/dbx-driver-redis/src/lib.rs b/crates/dbx-driver-redis/src/lib.rs index df84fd99f4..99c47f197f 100644 --- a/crates/dbx-driver-redis/src/lib.rs +++ b/crates/dbx-driver-redis/src/lib.rs @@ -43,7 +43,10 @@ const MAX_SAFE_INTEGER_CURSOR: u64 = (1 << 53) - 1; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct RedisDatabaseInfo { pub db: u32, - pub keys: u64, + /// 该库的键数量。`None` 表示服务端无法给出可信数量:kvrocks 的 DBSIZE / INFO keyspace + /// 键数是异步统计的(要先执行 `DBSIZE SCAN`),未统计前一律返回 0,这里不把 0 当作事实。 + #[serde(default, skip_serializing_if = "Option::is_none")] + pub keys: Option, } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -299,7 +302,30 @@ pub enum RedisValueData { #[serde(default, skip_serializing_if = "Option::is_none")] next_cursor: Option, }, - Unknown, + /// kvrocks 把位图实现成独立类型(`TYPE` 返回 `bitmap`),而 Redis 里 SETBIT 写入的 + /// 就是普通字符串,所以这个分支只会在 kvrocks 一类兼容服务上出现。kvrocks 上 + /// `GETRANGE`/`STRLEN` 对该类型会报 WRONGTYPE,只有 `GET` 能读到与 Redis 位序一致的 + /// 原始字节,因此这里用 GET 取内容、用 BITCOUNT 取置位数量。 + Bitmap { + content: RedisBlob, + #[serde(default, skip_serializing_if = "Option::is_none")] + total_bytes: Option, + #[serde(default, skip_serializing_if = "std::ops::Not::not")] + truncated: bool, + /// `BITCOUNT` 得到的置位数量;命令不可用时为 None。 + #[serde(default, skip_serializing_if = "Option::is_none")] + set_bits: Option, + }, + /// kvrocks 的 HyperLogLog 独立类型(`TYPE` 返回 `hyperloglog`):原始字节不可读, + /// 只能通过 `PFCOUNT` 展示基数估计。 + #[serde(rename = "hyperloglog")] + HyperLogLog { + #[serde(default, skip_serializing_if = "Option::is_none")] + count: Option, + }, + /// 服务端返回了 DBX 尚未支持的类型(如 kvrocks 的 `timeseries`/`TDIS-TYPE`)。 + /// 带上原始类型名,前端据此给出明确提示,而不是渲染成空值。 + Unknown { redis_type: String }, } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -1284,15 +1310,15 @@ where let configured_count = redis::cmd("CONFIG").arg("GET").arg("databases").query_async(con).await.ok().and_then(parse_database_count); - let keyspace_dbs = list_keyspace_databases(con).await.unwrap_or_default(); + let keyspace_db_infos = list_keyspace_databases(con).await.unwrap_or_default(); let database_count = configured_count.unwrap_or(DEFAULT_REDIS_DATABASES); - let max_db = keyspace_dbs.iter().map(|db| db.db).max().map(|db| db + 1).unwrap_or(0); + let max_db = keyspace_db_infos.iter().map(|db| db.db).max().map(|db| db + 1).unwrap_or(0); let visible_count = database_count.max(max_db).max(1); let keyspace_counts = - keyspace_dbs.into_iter().map(|db| (db.db, db.keys)).collect::>(); + keyspace_db_infos.into_iter().map(|db| (db.db, db.keys)).collect::>(); Ok((0..visible_count) - .map(|db| RedisDatabaseInfo { db, keys: keyspace_counts.get(&db).copied().unwrap_or(0) }) + .map(|db| RedisDatabaseInfo { db, keys: keyspace_counts.get(&db).copied().flatten() }) .collect()) } @@ -1318,16 +1344,29 @@ where { let info: String = redis::cmd("INFO").arg("keyspace").query_async(con).await.map_err(|e| e.to_string())?; + // kvrocks 的键数是异步统计出来的(官方文档:需要先执行 `DBSIZE SCAN` 才会更新 + // DBSIZE 与 INFO keyspace),未统计前它会把 dbN 的 keys 全部报成 0,并在 keyspace + // 段里带上 `last_dbsize_scan_timestamp:0`。识别到这个标记时不把 0 当成真实数量, + // 避免侧边栏显示 "db0 (0)" 这类误导信息。 + let keyspace_counts_are_stale = info.lines().any(|line| { + line.split_once(':').is_some_and(|(key, value)| { + key.trim().eq_ignore_ascii_case("last_dbsize_scan_timestamp") && value.trim() == "0" + }) + }); + let mut dbs = Vec::new(); for line in info.lines() { if line.starts_with("db") { if let Some((db_part, stats_part)) = line.split_once(':') { if let Some(num) = db_part.strip_prefix("db") { if let Ok(db) = num.parse::() { - let keys = stats_part - .split(',') - .find_map(|part| part.strip_prefix("keys=").and_then(|value| value.parse::().ok())) - .unwrap_or(0); + let keys = if keyspace_counts_are_stale { + None + } else { + stats_part + .split(',') + .find_map(|part| part.strip_prefix("keys=").and_then(|value| value.parse::().ok())) + }; dbs.push(RedisDatabaseInfo { db, keys }); } } @@ -1401,7 +1440,7 @@ pub fn decode_cluster_cursor(cursor: u64) -> (usize, u64) { pub async fn list_cluster_databases(pool: &RedisClusterPool) -> Result, String> { let master_nodes = cluster_master_nodes(pool).await?; let keys = cluster_total_keys(pool, &master_nodes).await; - Ok(vec![RedisDatabaseInfo { db: 0, keys }]) + Ok(vec![RedisDatabaseInfo { db: 0, keys: Some(keys) }]) } pub async fn scan_cluster_keys_page( @@ -2724,7 +2763,28 @@ where redis::cmd("JSON.GET").arg(key).query_async(con).await.map_err(|e| e.to_string())?; RedisValueData::Json { value: redis_json_raw_to_text(raw)? } } - _ => RedisValueData::Unknown, + // kvrocks 的位图/HLL 是独立类型,标准 Redis 类型表里没有它们;不处理就会落到 + // Unknown,界面上表现为“能看到 Key、看不到值”(issue #10406)。 + "bitmap" => { + // kvrocks 对位图类型只开放 GET(GETRANGE/STRLEN 会报 WRONGTYPE), + // 且 GET 返回的字节与 Redis 位序一致,可直接按字符串预览。 + let raw: RedisRawValue = redis::cmd("GET").arg(key).query_async(con).await.map_err(|e| e.to_string())?; + let mut bytes = redis_value_to_bytes(raw).unwrap_or_default(); + let truncated = bytes.len() > STRING_PREVIEW_MAX_BYTES; + if truncated { + bytes.truncate(STRING_PREVIEW_MAX_BYTES); + } + // 截断后拿不到准确长度(kvrocks 位图没有可用的 STRLEN),置空交给前端按未知处理 + let total_bytes = (!truncated).then_some(bytes.len() as u64); + let set_bits: Option = redis::cmd("BITCOUNT").arg(key).query_async(con).await.ok(); + RedisValueData::Bitmap { content: redis_blob_from_bytes(&bytes), total_bytes, truncated, set_bits } + } + "hyperloglog" => { + // HLL 原始字节不可读,基数估计是唯一可展示的数据 + let count: Option = redis::cmd("PFCOUNT").arg(key).query_async(con).await.ok(); + RedisValueData::HyperLogLog { count } + } + _ => RedisValueData::Unknown { redis_type: redis_type.clone() }, }; Ok(RedisValue { @@ -2792,7 +2852,9 @@ fn redis_search_value_text(value: &RedisValueData) -> String { }) .collect::>() .join(" "), - RedisValueData::Unknown => String::new(), + RedisValueData::Bitmap { content, .. } => redis_blob_display_text(content), + RedisValueData::HyperLogLog { count } => count.map(|value| value.to_string()).unwrap_or_default(), + RedisValueData::Unknown { .. } => String::new(), } } @@ -2821,7 +2883,14 @@ fn redis_search_value_size(value: &RedisValue) -> u64 { | RedisValueData::Hash { total, .. } | RedisValueData::Zset { total, .. } => *total, RedisValueData::Stream { entries, total, .. } => total.unwrap_or(entries.len() as u64), - RedisValueData::Unknown => 0, + RedisValueData::Bitmap { content, total_bytes, .. } => total_bytes.unwrap_or_else(|| { + base64::engine::general_purpose::STANDARD + .decode(&content.raw_base64) + .map(|bytes| bytes.len() as u64) + .unwrap_or(0) + }), + RedisValueData::HyperLogLog { .. } => 0, + RedisValueData::Unknown { .. } => 0, } }