fix(doris): preserve aggregate-state bytes in query results

This commit is contained in:
Guoyu Su authored and GitHub committed 2026-09-28 01:01:09 +08:00
1 parent 4bcab01489
commit c75ce783df
17 files changed
+1066 -42

No files matched your search

@@ -1,5 +1,15 @@
import { describe, expect, it } from "vitest";
import { binaryCellBytesToHexValue, canImportBinaryCellFile } from "@/lib/dataGrid/binaryCellDownload";
import {
binaryCellBytesToHexValue,
binaryCellClipboardText,
binaryCellDisplayText,
binaryCellDownloadPayload,
canImportBinaryCellFile,
hasUnsafeOpaqueAggregateStatePredicate,
isBinaryCellColumnType,
isOpaqueAggregateStateColumnType,
mergeOpaqueReadonlyColumnIndexes,
} from "@/lib/dataGrid/binaryCellDownload";
describe("binary cell file import", () => {
it("encodes arbitrary and empty files as prefixed hex cell values", () => {
@@ -14,5 +24,34 @@ describe("binary cell file import", () => {
expect(canImportBinaryCellFile("postgres", "text")).toBe(false);
expect(canImportBinaryCellFile("sqlserver", "varbinary(max)")).toBe(false);
expect(canImportBinaryCellFile("sqlite", "blob")).toBe(false);
expect(canImportBinaryCellFile("mysql", "agg_state<group_concat(text)>")).toBe(false);
});
it("presents aggregate states as opaque byte-preserving binary values", () => {
const type = "agg_state<group_concat(text)>";
const value = "0x0001abff";
expect(isOpaqueAggregateStateColumnType(type)).toBe(true);
expect(isOpaqueAggregateStateColumnType(" AGG_STATE < sum(int) > ")).toBe(true);
expect(isOpaqueAggregateStateColumnType("agg_state<")).toBe(false);
expect(isOpaqueAggregateStateColumnType("agg_state<>")).toBe(false);
expect(isOpaqueAggregateStateColumnType("😺agg_state<sum(int)>")).toBe(false);
expect(isBinaryCellColumnType(type)).toBe(true);
expect(binaryCellDisplayText(value, type, undefined, "mysql")).toBe("AGG_STATE [4 bytes]");
expect(binaryCellClipboardText(value, type, "mysql")).toBeNull();
expect(binaryCellDownloadPayload(value, "binary", type, "mysql").data).toEqual(new Uint8Array([0x00, 0x01, 0xab, 0xff]));
});
it("merges opaque columns into the centralized readonly indexes", () => {
const readonly = mergeOpaqueReadonlyColumnIndexes([0, 3], ["varchar", "agg_state<sum(int)>", "varbinary", "text"]);
expect([...readonly!]).toEqual([0, 3, 1]);
expect(mergeOpaqueReadonlyColumnIndexes(undefined, ["varchar", "varbinary"])).toBeUndefined();
});
it("only blocks keyless predicates for non-null or missing opaque values", () => {
const types = ["varchar", "agg_state<sum(int)>"];
expect(hasUnsafeOpaqueAggregateStatePredicate(types, ["Ada", null])).toBe(false);
expect(hasUnsafeOpaqueAggregateStatePredicate(types, ["Ada", "0x00ff"])).toBe(true);
expect(hasUnsafeOpaqueAggregateStatePredicate(types, ["Ada"])).toBe(true);
expect(hasUnsafeOpaqueAggregateStatePredicate(["varchar", "text"], ["Ada", "ordinary"])).toBe(false);
});
});
@@ -117,6 +117,7 @@ const BINARY_STRING_TYPE_RE = /^(?:binary|varbinary)(?:\b|\()/i;
const VARBINARY_TYPE_RE = /^varbinary(?:\b|\()/i;
const BLOB_TYPE_RE = /^(?:blob|tinyblob|mediumblob|longblob)(?:\b|\()/i;
const MYSQL_FILE_IMPORT_TYPE_RE = /^(?:blob|tinyblob|mediumblob|longblob|binary|varbinary)(?:\b|\()/i;
const OPAQUE_AGG_STATE_TYPE_RE = /^agg_state\s*<\s*[^>\s][^>]*>$/i;
function copyBytesForBlob(bytes: Uint8Array): Uint8Array<ArrayBuffer> {
return new Uint8Array(bytes);
@@ -181,7 +182,23 @@ export function parseBinaryCellBytes(value: unknown, columnType?: string, databa
export function isBinaryCellColumnType(columnType?: string): boolean {
const type = (columnType ?? "").trim();
return !!type && BINARY_TYPE_RE.test(type);
return !!type && (BINARY_TYPE_RE.test(type) || OPAQUE_AGG_STATE_TYPE_RE.test(type));
}
export function isOpaqueAggregateStateColumnType(columnType?: string): boolean {
return OPAQUE_AGG_STATE_TYPE_RE.test((columnType ?? "").trim());
}
export function hasUnsafeOpaqueAggregateStatePredicate(columnTypes: readonly (string | undefined)[], row: readonly CellValue[]): boolean {
return columnTypes.some((columnType, index) => isOpaqueAggregateStateColumnType(columnType) && row[index] !== null);
}
export function mergeOpaqueReadonlyColumnIndexes(readonlyColumnIndexes: readonly number[] | undefined, columnTypes: readonly (string | undefined)[]): ReadonlySet<number> | undefined {
const merged = new Set(readonlyColumnIndexes ?? []);
columnTypes.forEach((columnType, index) => {
if (isOpaqueAggregateStateColumnType(columnType)) merged.add(index);
});
return merged.size ? merged : undefined;
}
export function isBlobCellColumnType(columnType?: string): boolean {
@@ -294,6 +311,7 @@ export function binaryCellClipboardText(value: unknown, columnType?: string, dat
// “显示是文本、编辑器却是十六进制”的不一致,故 blob 文本预览仅在 mysql 连接开启。
// binary/varbinary 的文本预览早于该特性存在(如 TDengine BINARY 文本),保持全库通用。
function isBinaryCellTextPreviewColumn(columnType: string | undefined, databaseType: DatabaseType | undefined): boolean {
if (isOpaqueAggregateStateColumnType(columnType)) return false;
if (BINARY_STRING_TYPE_RE.test((columnType ?? "").trim())) return true;
return isBlobCellColumnType(columnType) && databaseType === "mysql";
}
@@ -367,6 +385,7 @@ function printableText(text: string): boolean {
}
function binaryCellDisplayLabel(columnType?: string): string {
if (isOpaqueAggregateStateColumnType(columnType)) return "AGG_STATE";
const base = (columnType ?? "")
.trim()
.split(/[(:\s]/)[0]