PromQL: support literals#96739
Merged
nikitamikhaylov merged 7 commits intoClickHouse:masterfrom Feb 20, 2026
Merged
Conversation
Contributor
|
Workflow [PR], commit [f172a3a] Summary: ⏳
|
clickhouse-gh
bot
added
the
pr-not-for-changelog
1 task
vitlibar
force-pushed
the
promql-support-literals
branch
from
c466a2c to
adb6d66
Compare
vitlibar
commented
Feb 12, 2026
vitlibar
commented
Feb 12, 2026
| writeString("\"value\":[", response); | ||
|
|
||
| // Write timestamp | ||
| if (result_block.has(TimeSeriesColumnNames::Timestamp)) |
Member
Author
There was a problem hiding this comment.
The second main change of this PR is here in PrometheusHTTPProtocolAPI: since after #95673 the result of the converter always has the same columns depending on the result type (SCALAR/STRING/INSTANT_VECTOR/RANGE_VECTOR), we don't really need to do checks like this. Also I moved some code in PrometheusHTTPProtocolAPI to optimize writing.
vitlibar
commented
Feb 12, 2026
| { | ||
| if (value < 0) | ||
| response.write('-'); | ||
| writeString("Inf", response); |
Member
Author
There was a problem hiding this comment.
We need to send Inf and NaN via HTTP API like this, so I've created a separate function for writing scalars here.
Contributor
There was a problem hiding this comment.
Pull request overview
Adds PromQL literal support end-to-end (parser → PromQL-to-SQL conversion → HTTP API JSON formatting), with new tests verifying scalar and string literal evaluation.
Changes:
- Add conversion for scalar and string literals into constant query pieces.
- Refactor Prometheus HTTP API response writer to handle scalar/string/vector/matrix via a unified path and improved JSON escaping.
- Add integration + parser tests for numeric, duration, and string literals.
Reviewed changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/integration/test_prometheus_protocols/test_evaluation.py | Adds integration coverage for scalar/string/duration/hex/scientific literals. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/fromSelector.cpp | Renames evaluation range getter usage to node_range_getter. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/fromLiteral.h | Declares literal-to-SQL conversion entry points. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/fromLiteral.cpp | Implements scalar and string literal conversion into SQLQueryPiece. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/applyOffset.cpp | Switches to node_range_getter for time bounds/step handling. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/applyFunctionOverRange.cpp | Switches to node_range_getter and renames locals accordingly. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/ConverterContext.h | Renames context member to node_range_getter. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/ConverterContext.cpp | Updates initialization for renamed getter. |
| src/Storages/TimeSeries/PrometheusQueryToSQL/Converter.cpp | Adds handling for Scalar and StringLiteral nodes. |
| src/Storages/TimeSeries/PrometheusHTTPProtocolAPI.h | Refactors query JSON writing API and adds FormatSettings member. |
| src/Storages/TimeSeries/PrometheusHTTPProtocolAPI.cpp | Implements unified JSON writer + scalar/string support; changes error handling and escaping. |
| src/Parsers/Prometheus/tests/gtest_PrometheusQueryTree.cpp | Adds parser tests for string literals/escapes/unicode. |
vitlibar
commented
Feb 12, 2026
…e after changing columns.
vitlibar
force-pushed
the
promql-support-literals
branch
from
adb6d66 to
930a535
Compare
vitlibar
commented
Feb 12, 2026
vitlibar
added
the
comp-promql
Member
Author
|
Ready for review |
Member
Author
|
I'll fix the test (it conflicted with #97063) |
nikitamikhaylov
approved these changes
Feb 20, 2026
Member
|
^^ The latest commit fixes only a unit test and all the unit tests checks passed. |
Merged
via the queue into
ClickHouse:master
with commit Feb 20, 2026
08b5125
123 of 146 checks passed
robot-ch-test-poll1
added
the
pr-synced-to-cloud
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):
PromQL: support literals
Part of #89356