rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-24 00:40:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: promql planner should clear its states on each selector (#2247)

Browse Source 
* reset planner status on selector

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* add sqlness test

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* add empty line

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* sort result

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* mask fields to keep ordering

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2023-08-24 22:07:44 -05:00
committed by GitHub
parent b13d932e4e
commit 20b7f907b2
3 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/promql/src/planner.rs
View File

@@ -98,6 +98,16 @@ impl PromPlannerContext {
..Default::default()
}
}
/// Reset all planner states
fn reset(&mut self) {
self.table_name = None;
self.time_index_column = None;
self.field_columns = vec![];
self.tag_columns = vec![];
self.field_column_matcher = None;
self.range = None;
}
}
pub struct PromPlanner {
@@ -473,6 +483,9 @@ impl PromPlanner {
/// Extract metric name from `__name__` matcher and set it into [PromPlannerContext].
/// Returns a new [Matchers] that doesn't contains metric name matcher.
///
/// Each call to this function means new selector is started. Thus the context will be reset
/// at first.
///
/// Name rule:
/// - if `name` is some, then the matchers MUST NOT contains `__name__` matcher.
/// - if `name` is none, then the matchers MAY contains NONE OR MULTIPLE `__name__` matchers.
@@ -481,6 +494,7 @@ impl PromPlanner {
label_matchers: &Matchers,
name: &Option<String>,
) -> Result<Matchers> {
self.ctx.reset();
let metric_name;
if let Some(name) = name.clone() {
metric_name = Some(name);
@@ -600,7 +614,14 @@ impl PromPlanner {
let _ = result_set.remove(&col);
}
self.ctx.field_columns = result_set.iter().cloned().collect();
// mask the field columns in context using computed result set
self.ctx.field_columns = self
.ctx
.field_columns
.drain(..)
.filter(|col| result_set.contains(col))
.collect();
let exprs = result_set
.into_iter()
.map(|col| DfExpr::Column(col.into()))