Skip to content

minor refactor of ast nodes to reduce duplication #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-clickhouse merged 1 commit into from
Feb 10, 2026
Merged

minor refactor of ast nodes to reduce duplication #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/core/decoder/format-decoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BinaryReader } from './reader';
import { ParsedData } from '../types/ast';
import { decodeLEB128 } from './leb128';
import { AstNode, ParsedData } from '../types/ast';
import { ClickHouseFormat } from '../types/formats';

/**
Expand All @@ -23,4 +24,33 @@ export abstract class FormatDecoder {
protected generateId(): string {
return `node-${this.nodeIdCounter++}`;
}

/** Decode a LEB128 varint and return both the value and a leaf AstNode for it */
protected decodeLEB128Node(label: string = 'length'): { count: number; node: AstNode } {
const start = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
return {
count,
node: {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start, end: this.reader.offset },
value: count,
displayValue: String(count),
label,
},
};
}

/** Create a UInt8 discriminant leaf node (for Nullable, Variant, Geometry, etc.) */
protected createDiscriminantNode(startOffset: number, value: number, label: string): AstNode {
return {
id: this.generateId(),
type: 'UInt8',
byteRange: { start: startOffset, end: startOffset + 1 },
value,
displayValue: String(value),
label,
};
}
}
147 changes: 12 additions & 135 deletions src/core/decoder/rowbinary-decoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,18 +754,7 @@ export class RowBinaryDecoder extends FormatDecoder {
private decodeArray(elementType: ClickHouseType): AstNode {
const startOffset = this.reader.offset;

// Decode array length with AST node
const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand Down Expand Up @@ -812,17 +801,7 @@ export class RowBinaryDecoder extends FormatDecoder {
private decodeMap(keyType: ClickHouseType, valueType: ClickHouseType): AstNode {
const startOffset = this.reader.offset;

// Decode map length with AST node
const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};
const { count, node: lengthNode } = this.decodeLEB128Node();

const children: AstNode[] = [lengthNode];

Expand Down Expand Up @@ -872,15 +851,7 @@ export class RowBinaryDecoder extends FormatDecoder {
};
}

const discriminantNode: AstNode = {
id: this.generateId(),
type: 'UInt8',
byteRange: { start: startOffset, end: startOffset + 1 },
value: isNull,
displayValue: '0',
label: 'is_null',
};

const discriminantNode = this.createDiscriminantNode(startOffset, isNull, 'is_null');
const child = this.decodeValue(innerType);
return {
id: this.generateId(),
Expand Down Expand Up @@ -913,16 +884,7 @@ export class RowBinaryDecoder extends FormatDecoder {
}

const selectedType = variants[discriminant];

const discriminantNode: AstNode = {
id: this.generateId(),
type: 'UInt8',
byteRange: { start: startOffset, end: startOffset + 1 },
value: discriminant,
displayValue: String(discriminant),
label: 'discriminant',
};

const discriminantNode = this.createDiscriminantNode(startOffset, discriminant, 'discriminant');
const child = this.decodeValue(selectedType);

return {
Expand Down Expand Up @@ -1235,18 +1197,7 @@ export class RowBinaryDecoder extends FormatDecoder {
private decodeJSON(typedPaths?: Map<string, ClickHouseType>): AstNode {
const startOffset = this.reader.offset;

// Read number of paths with AST node
const pathCountStart = this.reader.offset;
const { value: pathCount } = decodeLEB128(this.reader);
const pathCountNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: pathCountStart, end: this.reader.offset },
value: pathCount,
displayValue: String(pathCount),
label: 'path_count',
};

const { count: pathCount, node: pathCountNode } = this.decodeLEB128Node('path_count');
const children: AstNode[] = [pathCountNode];

for (let i = 0; i < pathCount; i++) {
Expand Down Expand Up @@ -1332,18 +1283,7 @@ export class RowBinaryDecoder extends FormatDecoder {
// Ring = Array(Point)
private decodeRing(): AstNode {
const startOffset = this.reader.offset;

const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand All @@ -1365,18 +1305,7 @@ export class RowBinaryDecoder extends FormatDecoder {
// Polygon = Array(Ring)
private decodePolygon(): AstNode {
const startOffset = this.reader.offset;

const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand All @@ -1398,18 +1327,7 @@ export class RowBinaryDecoder extends FormatDecoder {
// MultiPolygon = Array(Polygon)
private decodeMultiPolygon(): AstNode {
const startOffset = this.reader.offset;

const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand All @@ -1431,18 +1349,7 @@ export class RowBinaryDecoder extends FormatDecoder {
// LineString = Array(Point)
private decodeLineString(): AstNode {
const startOffset = this.reader.offset;

const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand All @@ -1464,18 +1371,7 @@ export class RowBinaryDecoder extends FormatDecoder {
// MultiLineString = Array(LineString)
private decodeMultiLineString(): AstNode {
const startOffset = this.reader.offset;

const lengthStart = this.reader.offset;
const { value: count } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: count,
displayValue: String(count),
label: 'length',
};

const { count, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];

for (let i = 0; i < count; i++) {
Expand Down Expand Up @@ -1533,15 +1429,7 @@ export class RowBinaryDecoder extends FormatDecoder {
throw new Error(`Unknown Geometry discriminant: ${discriminant}`);
}

const discriminantNode: AstNode = {
id: this.generateId(),
type: 'UInt8',
byteRange: { start: startOffset, end: startOffset + 1 },
value: discriminant,
displayValue: String(discriminant),
label: 'discriminant',
};

const discriminantNode = this.createDiscriminantNode(startOffset, discriminant, 'discriminant');
return {
id: this.generateId(),
type: 'Geometry',
Expand Down Expand Up @@ -1581,18 +1469,7 @@ export class RowBinaryDecoder extends FormatDecoder {
private decodeQBit(elementType: ClickHouseType, dimension: number): AstNode {
const startOffset = this.reader.offset;

// Read size (should match dimension) with AST node
const lengthStart = this.reader.offset;
const { value: size } = decodeLEB128(this.reader);
const lengthNode: AstNode = {
id: this.generateId(),
type: 'VarUInt',
byteRange: { start: lengthStart, end: this.reader.offset },
value: size,
displayValue: String(size),
label: 'length',
};

const { count: size, node: lengthNode } = this.decodeLEB128Node();
const children: AstNode[] = [lengthNode];
for (let i = 0; i < size; i++) {
const child = this.decodeValue(elementType);
Expand Down