Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5aef3bc
perf(promql): evaluate range functions and aggregations in ClickHouse
Makisuo Nov 15, 2026
6fa18bf
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
2ba9bc6
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
cd6ea63
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
8dafa2d
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
9486e3c
fix(promql): pushdown overflow, metric names and le grouping
Makisuo Nov 15, 2026
884c2c7
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
7aa3dd2
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
9c2cbf5
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
3287979
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
cbb79fa
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
74c4e62
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
4a08092
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
40e044b
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
7e3b5a4
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
ea5a887
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
c727a5c
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
3657f10
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
586096c
fix(promql): grouped pushdown labels are built without prototype writes
Makisuo Nov 15, 2026
1b8fb71
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 15, 2026
0fe27ec
test(promql): pushdown reads are held to single-tenant too
Makisuo Nov 15, 2026
594d1b1
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 16, 2026
aca29ab
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 16, 2026
2564734
Merge branch 'promql/2-warehouse' into promql/3-pushdown
Makisuo Nov 16, 2026
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
204 changes: 204 additions & 0 deletions apps/cli/scripts/bench-promql.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
/**
* PromQL on the warehouse at volume, on chDB.
*
* MAPLE_TELEMETRY=off bun run scripts/bench-promql.ts [--series 1000] [--hours 24]
*
* Loads a counter with `--series` series and a 12-bucket histogram with a fifth of
* that, scraped every 15 s for `--hours`, plus an unrelated metric of the same size
* the scan must skip. Times each query's SQL (per selector) and evaluation.
*/
import { mkdtempSync, rmSync } from "node:fs"
import { tmpdir } from "node:os"
import { join } from "node:path"
import { Effect, Result } from "effect"
import schemaSql from "@maple/local-server/schema/local-schema.sql" with { type: "text" }
import { Chdb } from "@maple/local-server/chdb"
import { decodeJsonEachRow } from "@maple/local-server/chdb-rows"
import { normalizeSqlForClickHouseClient } from "@maple/query-engine/execution"
import * as CH from "@maple/query-engine/ch"
import {
buildPushdownQuery,
buildSelectorQueries,
catalogFromRows,
catalogQuery,
promqlCatalogRowSchema,
promqlPushdownRowSchema,
promqlSelectorRowSchema,
toPushdownData,
toSelectorData,
} from "@maple/query-engine/promql"
import {
evaluate,
type Expr,
parse,
planPushdowns,
planRequests,
type PushdownData,
type SelectorData,
type VectorSelector,
} from "@maple/promql"
import { OrgId } from "@maple/domain"

const arg = (name: string, fallback: number): number => {
const index = process.argv.indexOf(`--${name}`)
return index === -1 ? fallback : Number(process.argv[index + 1])
}
const SERIES = arg("series", 1000)
const HOURS = arg("hours", 24)
const ORG = "org_bench"
const HOUR_MS = 3_600_000
const END = Math.floor(Date.now() / HOUR_MS) * HOUR_MS - HOUR_MS
const START = END - HOURS * HOUR_MS
const POINTS = (HOURS * HOUR_MS) / 15_000

const root = mkdtempSync(join(tmpdir(), "maple-promql-bench-"))
const db = Chdb.open({ dataDir: join(root, "data"), schemaSql })

const time = <A>(f: () => A): [A, number] => {
const t0 = performance.now()
const out = f()
return [out, performance.now() - t0]
}

const load = () => {
const ts = `fromUnixTimestamp64Milli(toInt64(${START} + (number % ${POINTS}) * 15000))`
const counter = (name: string) => `
INSERT INTO metrics_sum (OrgId, ResourceAttributes, ServiceName, MetricName, Attributes, StartTimeUnix, TimeUnix, Value, AggregationTemporality, IsMonotonic)
SELECT '${ORG}', map('service.name', 'svc-' || toString(intDiv(number, ${POINTS}) % 10), 'k8s.pod.name', 'pod-' || toString(intDiv(number, ${POINTS}))),
'svc-' || toString(intDiv(number, ${POINTS}) % 10), '${name}',
map('route', '/r' || toString(intDiv(number, ${POINTS}) % 50), 'status', toString(200 + (intDiv(number, ${POINTS}) % 4) * 100)),
fromUnixTimestamp64Milli(toInt64(${START - HOUR_MS})), ${ts},
toFloat64((number % ${POINTS}) * (1 + intDiv(number, ${POINTS}) % 7)), 2, true
FROM numbers(${SERIES * POINTS})`
db.exec(counter("http_requests_total"))
db.exec(counter("other_requests_total"))
db.exec(`
INSERT INTO metrics_histogram (OrgId, ResourceAttributes, ServiceName, MetricName, MetricUnit, Attributes, StartTimeUnix, TimeUnix, Count, Sum, BucketCounts, ExplicitBounds, AggregationTemporality)
SELECT '${ORG}', map('service.name', 'svc-' || toString(intDiv(number, ${POINTS}) % 10)), 'svc-' || toString(intDiv(number, ${POINTS}) % 10),
'http.server.request.duration', 's', map('http.route', '/r' || toString(intDiv(number, ${POINTS}) % 50)),
fromUnixTimestamp64Milli(toInt64(${START - HOUR_MS})), ${ts},
(number % ${POINTS}) * 12, toFloat64(number % ${POINTS}) * 3.5,
arrayMap(i -> toUInt64(number % ${POINTS}), range(12)),
[0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5], 2
FROM numbers(${Math.max(1, Math.floor(SERIES / 5)) * POINTS})`)
}

const [, loadMs] = time(load)
console.log(
`loaded ${(SERIES * POINTS * 2 + Math.floor(SERIES / 5) * POINTS).toLocaleString()} rows in ${(loadMs / 1000).toFixed(1)}s`,
)

const catalogRows = decodeJsonEachRow(promqlCatalogRowSchema)(
db.query(
normalizeSqlForClickHouseClient(
CH.compileUnsafe(catalogQuery(), {
orgId: OrgId.make(ORG),
startTime: new Date(START - 2 * HOUR_MS).toISOString().slice(0, 19).replace("T", " "),
endTime: new Date(END + HOUR_MS).toISOString().slice(0, 19).replace("T", " "),
}).sql,
),
),
)
const catalog = catalogFromRows(catalogRows)
const decodeRows = decodeJsonEachRow(promqlSelectorRowSchema)

const decodePushdown = decodeJsonEachRow(promqlPushdownRowSchema)
const pushdownEnabled = !process.argv.includes("--no-pushdown")

const run = (query: string, params: { startMs: number; endMs: number; stepMs: number }) => {
const parsed = parse(query)
if (Result.isFailure(parsed)) throw new Error(parsed.failure.message)
const data = new Map<VectorSelector, SelectorData>()
const pushed = new Map<Expr, PushdownData>()
const skipped = new Set<VectorSelector>()
let sqlMs = 0
let rows = 0
let buckets = 0
let jsonBytes = 0
for (const [node, candidate] of pushdownEnabled ? planPushdowns(parsed.success, params) : []) {
const plan = buildPushdownQuery(candidate.request, catalog, {
orgId: OrgId.make(ORG),
maxSeries: 10_000,
})
if (plan === undefined) continue
const sql = normalizeSqlForClickHouseClient(Effect.runSync(plan.compiled).sql)
const [raw, ms] = time(() => db.query(sql))
sqlMs += ms
jsonBytes += raw.length
const decoded = decodePushdown(raw)
rows += decoded.length
for (const r of decoded) buckets += r.values.length
pushed.set(node, toPushdownData(candidate.request, plan, decoded))
skipped.add(candidate.selector)
}
for (const [selector, request] of planRequests(parsed.success, params)) {
if (skipped.has(selector)) continue
const results = buildSelectorQueries(request, catalog, {
orgId: OrgId.make(ORG),
maxSeries: 10_000,
}).map((plan) => {
const sql = normalizeSqlForClickHouseClient(Effect.runSync(plan.compiled).sql)
const [raw, ms] = time(() => db.query(sql))
sqlMs += ms
jsonBytes += typeof raw === "string" ? raw.length : JSON.stringify(raw).length
const decoded = decodeRows(raw)
rows += decoded.length
return { plan, rows: decoded }
})
const selectorData = toSelectorData(request, results)
for (const s of selectorData.series) buckets += s.buckets.length
data.set(selector, selectorData)
}
Bun.gc(true)
const heapMb = process.memoryUsage().heapUsed / 1e6
const [result, evalMs] = time(() => evaluate({ expr: parsed.success, params, data, pushed }))
if (Result.isFailure(result)) throw new Error(result.failure.message)
const out = result.success
const outSeries = out.resultType === "matrix" || out.resultType === "vector" ? out.result.length : 1
Bun.gc(true)
const afterMb = process.memoryUsage().heapUsed / 1e6
return { sqlMs, evalMs, rows, buckets, outSeries, heapMb, afterMb, jsonMb: jsonBytes / 1e6 }
}

const cases: Array<[string, string, { startMs: number; endMs: number; stepMs: number }]> = [
[
"24h step 5m",
"sum by (route) (rate(http_requests_total[5m]))",
{ startMs: START + HOUR_MS, endMs: END, stepMs: 300_000 },
],
[
"24h step 60s",
"sum by (status) (rate(http_requests_total[$r]))".replace("$r", "4m"),
{ startMs: START + HOUR_MS, endMs: END, stepMs: 60_000 },
],
[
"1h step 15s",
'sum by (route) (rate(http_requests_total{status="200"}[1m]))',
{ startMs: END - HOUR_MS, endMs: END, stepMs: 15_000 },
],
[
"6h p95",
"histogram_quantile(0.95, sum by (le, http_route) (rate(http_server_request_duration_seconds_bucket[5m])))",
{ startMs: END - 6 * HOUR_MS, endMs: END, stepMs: 60_000 },
],
[
"instant",
"topk(5, sum by (k8s_pod_name) (increase(http_requests_total[1h])))",
{ startMs: END, endMs: END, stepMs: 0 },
],
[
"regex 6h",
'sum(rate(http_requests_total{route=~"/r1.*"}[5m]))',
{ startMs: END - 6 * HOUR_MS, endMs: END, stepMs: 60_000 },
],
]

for (const [name, query, params] of cases) {
run(query, params)
const r = run(query, params)
console.log(
`${name.padEnd(12)} sql ${r.sqlMs.toFixed(0).padStart(6)}ms eval ${r.evalMs.toFixed(0).padStart(5)}ms rows ${String(r.rows).padStart(5)} buckets ${String(r.buckets).padStart(8)} out ${r.outSeries} json ${r.jsonMb.toFixed(0)}MB heap ${r.heapMb.toFixed(0)}->${r.afterMb.toFixed(0)}MB ${query}`,
)
}
db.close()
rmSync(root, { recursive: true, force: true })
50 changes: 42 additions & 8 deletions apps/cli/test/promql-engine.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,25 @@ import { decodeJsonEachRow } from "@maple/local-server/chdb-rows"
import { normalizeSqlForClickHouseClient } from "@maple/query-engine/execution"
import * as CH from "@maple/query-engine/ch"
import {
buildPushdownQuery,
buildSelectorQueries,
catalogFromRows,
catalogQuery,
promqlCatalogRowSchema,
promqlPushdownRowSchema,
promqlSelectorRowSchema,
toPushdownData,
toSelectorData,
type CatalogMetric,
} from "@maple/query-engine/promql"
import {
evaluate,
type Expr,
memorySource,
parse,
planPushdowns,
planRequests,
type PushdownData,
type QueryParams,
type QueryResult,
type RawSeries,
Expand Down Expand Up @@ -110,6 +116,9 @@ const insertHistogram = (db: Chdb, service: string): void => {
}

const decodeRows = decodeJsonEachRow(promqlSelectorRowSchema)
const decodePushdown = decodeJsonEachRow(promqlPushdownRowSchema)
const options = { orgId: OrgId.make(ORG), maxSeries: 10_000 }
let pushedCount = 0
const decodeCatalog = decodeJsonEachRow(promqlCatalogRowSchema)

/** The tenant scope of every compiled read; the warehouse refuses anything but single-tenant. */
Expand All @@ -119,11 +128,28 @@ const sqlOf = (compiled: { readonly sql: string; readonly tenantScope: string })
return normalizeSqlForClickHouseClient(compiled.sql)
}

const sqlRun = (db: Chdb, catalog: ReadonlyArray<CatalogMetric>, query: string, params: QueryParams) => {
const sqlRun = (
db: Chdb,
catalog: ReadonlyArray<CatalogMetric>,
query: string,
params: QueryParams,
pushdown: boolean,
) => {
const parsed = parse(query)
if (Result.isFailure(parsed)) return Result.fail(parsed.failure.message)
const pushed = new Map<Expr, PushdownData>()
const skipped = new Set<VectorSelector>()
for (const [node, candidate] of pushdown ? planPushdowns(parsed.success, params) : []) {
const plan = buildPushdownQuery(candidate.request, catalog, options)
if (plan === undefined) continue
const rows = decodePushdown(db.query(sqlOf(Effect.runSync(plan.compiled))))
pushed.set(node, toPushdownData(candidate.request, plan, rows))
skipped.add(candidate.selector)
pushedCount += 1
}
const data = new Map<VectorSelector, SelectorData>()
for (const [selector, request] of planRequests(parsed.success, params)) {
if (skipped.has(selector)) continue
const results = Arr.map(
buildSelectorQueries(request, catalog, { orgId: OrgId.make(ORG), maxSeries: 10_000 }),
(plan) => ({
Expand All @@ -133,7 +159,7 @@ const sqlRun = (db: Chdb, catalog: ReadonlyArray<CatalogMetric>, query: string,
)
data.set(selector, toSelectorData(request, results))
}
return Result.mapError(evaluate({ expr: parsed.success, params, data }), (e) => e.message)
return Result.mapError(evaluate({ expr: parsed.success, params, data, pushed }), (e) => e.message)
}

const flatten = (result: QueryResult): ReadonlyArray<readonly [string, number, number]> => {
Expand Down Expand Up @@ -222,17 +248,25 @@ describeWithChdb("PromQL on the warehouse matches the reference", () => {
test(query, () => {
for (const { name, params } of cases) {
const want = runQuery(query, params, reference)
const got = sqlRun(db, catalog, query, params)
if (Result.isFailure(want)) {
expect(Result.isFailure(got)).toBe(true)
continue
for (const pushdown of [false, true]) {
const label = `${name}${pushdown ? " pushdown" : ""}`
const got = sqlRun(db, catalog, query, params, pushdown)
if (Result.isFailure(want)) {
expect(Result.isFailure(got)).toBe(true)
continue
}
if (Result.isFailure(got)) throw new Error(`${label}: ${got.failure}`)
expect(`${label}: ${mismatch(got.success, want.success) ?? "ok"}`).toBe(`${label}: ok`)
}
if (Result.isFailure(got)) throw new Error(`${name}: ${got.failure}`)
expect(`${name}: ${mismatch(got.success, want.success) ?? "ok"}`).toBe(`${name}: ok`)
}
})
}

test("pushes most of the corpus down", () => {
// Each corpus query runs four cases; dozens of them have a pushable subtree.
expect(pushedCount).toBeGreaterThan(100)
})

test("every compiled read is single-tenant, as the warehouse requires", () => {
expect([...scopes]).toEqual(["single-tenant"])
})
Expand Down
1 change: 1 addition & 0 deletions knip.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
},
"apps/cli": {
"entry": [
"scripts/*.ts",
"test/probes/*.ts",
"test/archive-probe-helpers.ts",
"test/merge-injection-probe.ts",
Expand Down
2 changes: 2 additions & 0 deletions lib/promql/scripts/compliance/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ export const QUERIES: ReadonlyArray<string> = [
"quantile(0.5, node_memory_free_bytes)",
'count_values("value", http_requests_total > 0)',
"group by (job) (http_requests_total)",
"sum by (__name__) (rate(http_requests_total[5m]))",
"sum by (__name__, job) (last_over_time(node_memory_free_bytes[5m]))",
// histograms
"histogram_quantile(0.95, sum by (le) (rate(http_request_duration_seconds_bucket[5m])))",
"histogram_quantile(0.5, sum by (le, service) (rate(http_request_duration_seconds_bucket[5m])))",
Expand Down
Loading
Loading