Advanced Query Processing Architecture #7
Conversation
…7534) * Loki query splitting: interpolate queries before execution * Update tests * Prettier * shardQuerySplitting: remove unnecessary call
|
cursor review |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| .filter((query) => query.expr) | ||
| .filter((query) => !query.hide); | ||
| .filter((query) => !query.hide) | ||
| .map((query) => datasource.applyTemplateVariables(query, request.scopedVars, request.filters)); |
There was a problem hiding this comment.
Bug: Template Variables: Double Interpolation Breaks Queries.
Template variables are interpolated twice when shard splitting is enabled. runShardSplitQuery calls applyTemplateVariables on each query, then passes them to runSplitQuery which calls applyTemplateVariables again. This double interpolation can cause variables to be incorrectly replaced multiple times, potentially breaking queries that contain variable-like patterns in their interpolated values.
| const queries = request.targets | ||
| .filter((query) => !query.hide) | ||
| .filter((query) => query.expr) | ||
| .map((query) => datasource.applyTemplateVariables(query, request.scopedVars, request.filters)); |
There was a problem hiding this comment.
Bug: Double Interpolation Glitch for Template Variables
Template variables are interpolated twice in the regular query splitting path. The new code calls applyTemplateVariables in runSplitQuery, but DataSourceWithBackend.query() (called via datasource.runQuery) also calls applyTemplateVariables. The old code didn't interpolate in runSplitQuery, relying solely on the backend interpolation. This double interpolation can cause variables to be incorrectly replaced multiple times.
Test 4
Replicated from ai-code-review-evaluation/grafana-cursor#4
Note
Interpolates template variables on Loki queries before time- and shard-based splitting, updating tests and mocks accordingly.
querySplitting.ts):datasource.applyTemplateVariablesto targets before filtering and splitting.shardQuerySplitting.ts):applyTemplateVariablesprior to sharding; replace previous interpolation method.$__autoand$stepbefore execution for both split and shard-split paths.applyTemplateVariablesand adjust expectations (expressions, steps, call counts, request shapes).Written by Cursor Bugbot for commit 3ba2457. Configure here.