Support PromQL count_values#104492
Conversation
Add the common PromQL compliance reporting and developer notes used by the follow-up TimeSeries PromQL lowering slices. Keep the parser compliance corpus expectation explicit for selectors Prometheus rejects.
Add focused Prometheus protocol tests for user-facing native lowering errors: unsupported-but-parseable functions and invalid date-function arity. These are semantic guardrails for clear errors, not broad coverage padding.
Implement native SQL lowering for PromQL count_values(label, vector) using the existing TimeSeries group/tag representation. The lowering formats sample values as Prometheus label strings, overwrites the destination label before aggregation, handles by/without grouping, and packs per-step counts back onto the vector grid. Also adds focused differential coverage for value formatting, destination-label overwrite, grouping variants, sparse subquery results, and empty inputs, plus compliance cases for count_values variants. Validation: git diff --check; Python py_compile for updated PromQL tests; Dockerized Build (amd_debug) passed; focused test_aggregation_operators passed; test_promql_compliance passed.
Avoid fork-local wording in the PromQL review base. These are ClickHouse PromQL regression cases and evidence requirements, not fork-specific artifacts.
Avoid fork-local wording in the PromQL review base. These are ClickHouse PromQL regression cases and evidence requirements, not fork-specific artifacts.
Remove the standalone native histogram discovery Markdown note from the PromQL split branches.
Remove the standalone native histogram discovery Markdown note from the PromQL split branches.
Remove downstream promshim-specific evidence and non-goal language from the native PromQL lowering README so the note stays focused on ClickHouse review guidance.
Remove downstream promshim-specific evidence and non-goal language from the native PromQL lowering README so the note stays focused on ClickHouse review guidance.
Rewrite the native PromQL lowering notes around external SQL-transpiler measurements. Document measured and mixed SQL patterns with target PromQL shapes, pseudocode, and the ClickHouse-side validation expected for in-tree changes.
Rewrite the native PromQL lowering notes around external SQL-transpiler measurements. Document measured and mixed SQL patterns with target PromQL shapes, pseudocode, and the ClickHouse-side validation expected for in-tree changes.
Replace external corpus row names with concrete PromQL expressions and query-range context in the native PromQL lowering notes.
Replace external corpus row names with concrete PromQL expressions and query-range context in the native PromQL lowering notes.
Match Prometheus parser behavior by requiring vector selectors to contain at
least one matcher that cannot match an empty label value. This prevents broad
selectors like `{job=~".*"}` or `{__name__=~".*"}` from silently selecting every
metric when the user likely intended an explicit non-empty constraint.
Users who intentionally want all real metrics can still use `{__name__=~".+"}`,
and empty-matching label matchers remain valid when combined with that explicit
metric-name matcher.
Deduplicate expanded compliance cases by query text before checking the `should_fail` expectation. A query listed once as expected success and once as expected failure is now reported as conflicting metadata instead of slipping through as two separate cases.
…plit/promql-count-values
Mirror the upstream PromQL compliance corpus for label transformation invalid label-name cases. These cases should remain should-fail entries so ClickHouse acceptance of invalid destination labels stays visible as a rejection mismatch rather than being counted as expected coverage.
`count_values` creates an output label from its string argument. Keep that argument constrained to PromQL label-name syntax instead of accepting every non-empty UTF-8 string, so invalid names such as `~invalid` are rejected before rendering a label key that selectors cannot address.
Do not stop selector validation after finding the first matcher that cannot match an empty label value. Later regex matchers still need syntax validation so equivalent selector reorderings cannot change parse validity. Add parser regressions for invalid regex matchers after an implicit metric-name matcher and after explicit non-empty matchers.
Add parser and HTTP API coverage for Prometheus selector validation rules: negated non-empty matchers, invalid regex validation after non-empty matchers, and duplicate metric-name matchers. Rejecting duplicate outside/in-brace metric names keeps ClickHouse parsing aligned with Prometheus expression parsing.
Use Prometheus UTF-8 label-name validation for the generated value label, so current Prometheus-valid names such as ~value are accepted while empty labels still fail. Add focused and compliance coverage for generated-label insertion before grouping, by/without behavior, label overwrite, FormatFloat edge cases including -0, empty inputs, and scalar-grid range evaluation. Validation: - ninja -C build_debug clickhouse - test_evaluation.py::test_aggregation_operators - test_compliance.py::test_promql_compliance
Ignore string literals and selector matchers when routing compliance failures by query shape. This keeps report categories from treating label values or exponent signs as binary operators, and recognizes bare '<' and '>' comparisons.
Use the existing eps parameter when checking live Prometheus HTTP results against expected JSON, and compare ClickHouse HTTP output against the live Prometheus result. This keeps numeric drift bounded to eps while preserving exact shape, label, and timestamp checks.
`clickhouse_fuzzer` runs the full `clickhouse-local` binary (see
`programs/local/fuzzers/clickhouse_fuzzer.cpp`) which spins up a complete
clickhouse-server-grade runtime: JeMalloc arenas, OpenSSL initializer,
static initializers, and full query execution. Baseline RSS is close to
the libFuzzer default `rss_limit_mb=2048`, so fuzzed inputs that trigger
even moderate query-time allocations push the process past the limit.
CIDB shows 7 unrelated PRs in 7 days all hitting OOM at 2049-2056 Mb —
just barely over the 2048 Mb default. Failure mode is uniform:
libFuzzer out-of-memory (used: 2049-2056Mb; limit: 2048Mb) oom-<hash>
Bumping to 4096 Mb follows existing precedent for fuzzers with similar
workloads:
- `execute_query_fuzzer.options`: rss_limit_mb = 4096 (also runs query
execution; same author bumped this in commit bafb7d7)
- `data_type_deserialization_fuzzer.options`: rss_limit_mb = 4096
- `create_parser_fuzzer.options`: rss_limit_mb = 6144
The limit still bounds the target (it does not disable the check via
`rss_limit_mb=0`), so genuine memory regressions above 4 GB will still
be caught.
CIDB evidence (last 30 days, all 10 hits — 0 on master because libFuzzer
does not run on master regularly):
PR ClickHouse#99740 (4 hits, Apr 19-21)
PR ClickHouse#104231, ClickHouse#104849, ClickHouse#104956, ClickHouse#96844, ClickHouse#104510, ClickHouse#104492 (1 hit each,
May 13-15)
Matcher validation intentionally turns malformed label regexes into PromQL parse errors. Construct RE2 with log_errors disabled so rejected selectors do not also emit internal RE2 error log lines on every parse attempt.
Prometheus excludes __name__ from without-grouping keys even when count_values writes its generated sample-value label to __name__. Cover that behavior explicitly so the ClickHouse SQL lowering keeps collapsing buckets by the remaining labels instead of preserving the generated metric name as a grouping key.
Keep the PromQL parser, modifier, and selector fixes from the local matrix pass, but move the high-value regression coverage into the existing protocol and compliance suites instead of adding the standalone matrix harness to the PR branch.\n\nThis keeps fixed-time range evaluation covered through the existing evaluation tests and records the parser, matcher, timestamp-modifier, and sparse range cases in the shared compliance corpus.
Build (arm_tidy) flagged the vector-grid finalization predicate because one call cloned an AST pointer while another argument moved the same pointer. C++ argument evaluation order can make that a use-after-move.\n\nCreate separate AST nodes for the null and stale-marker checks so the generated predicate stays the same without relying on argument evaluation order.
Parse `@ start()` and `@ end()` as timestamp modifier variants instead of rewriting the raw query text before parsing. This keeps label values and regular expressions untouched while resolving symbolic bounds in the query range planner. Propagate symbolic `@` modifiers through the PromQL tree and SQL lowering so instant selectors and range-vector functions bind to the query start or end consistently with Prometheus.
The selector-matcher validation branch should not also introduce symbolic `@ start()` and `@ end()` modifier parsing. Remove that parser/evaluation feature from the base branch so the behavior can be reviewed independently. Move the symbolic timestamp-modifier compliance cases out with the feature. Keep the offset-only case here because it exercises existing modifier behavior.
Symbolic `@ start()` and `@ end()` modifiers need parser-level handling so selectors, string literals, and regular expressions are not rewritten as raw text. Remove the temporary text-substitution path from the base branch; the symbolic modifier implementation belongs with the dedicated parser change.
| timeSeriesScalarToAST(0, context.scalar_data_type)))); | ||
| builder.select_list.back()->setAlias(value_label_column); | ||
|
|
||
| builder.where = makeASTFunction( |
There was a problem hiding this comment.
count_values needs to drop Prometheus stale markers before formatting sample values. Instant selectors are lowered with stale-marker filtering disabled, so a series whose latest sample is the stale marker reaches this isNotNull check as a non-null NaN; timeSeriesPrometheusFormatFloat then emits NaN and this path returns a {value="NaN"} bucket. Prometheus treats that instant vector as empty, and finalizeSQL.cpp already has the stale-marker predicate for plain instant-vector output, so this diverges for stale series. Please add the same reinterpretAsUInt64(...) != 0x7ff0000000000002 predicate before Step 3 and cover count_values("value", stale_series) with a stale-marker sample.
LLVM Coverage ReportChanged lines: Changed C/C++ lines covered by tests: 413/457 (90.37%) | Lost baseline coverage (was covered on master, now uncovered in this PR): 2 line(s) · Uncovered code |

Adds native lowering for the PromQL
count_valuesaggregation operator over ClickHouseTimeSeriesdata.The lowering formats sample values as Prometheus label strings, adds the generated value label into the output grouping, and packs sparse per-step counts back into the vector-grid shape used by the PromQL endpoint.
Split out from the integration draft #104271; shared base #104484.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):
Added native PromQL-to-SQL lowering for
count_valuesover ClickHouseTimeSeriesdata.Documentation entry for user-facing changes