Skip to content

feat: fill*() binop modifiers #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunng87 merged 5 commits into from
Apr 8, 2026
Merged

feat: fill*() binop modifiers #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30d9f39
feat: fill*() binop modifiers
sunng87 Mar 9, 2026
f87bb2b
refactor: improve parser and avoid unwrap
sunng87 Mar 9, 2026
d808230
feat: allow fill/fill_left/fill_right as metric identifier
sunng87 Apr 1, 2026
b4cb570
chore: restore test being removed
sunng87 Apr 2, 2026
0eb8135
refactor: remove unneeded branch
sunng87 Apr 3, 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
4 changes: 2 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ use lrlex::{ct_token_map, DefaultLexerTypes};
use lrpar::CTParserBuilder;

fn main() -> Result<(), Box<dyn std::error::Error>> {
let ctp = CTParserBuilder::<DefaultLexerTypes<u8>>::new()
let ctp = CTParserBuilder::<DefaultLexerTypes<u16>>::new()
.yacckind(YaccKind::Grmtools)
.recoverer(lrpar::RecoveryKind::None)
.grammar_in_src_dir("parser/promql.y")?
.build()?;
ct_token_map::<u8>("token_map", ctp.token_map(), None)
ct_token_map::<u16>("token_map", ctp.token_map(), None)
}
94 changes: 81 additions & 13 deletions src/parser/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,38 @@ impl VectorMatchCardinality {
}
}

/// VectorMatchFillValues contains the fill values to use for Vector matching
/// when one side does not find a match on the other side.
/// When a fill value is nil, no fill is applied for that side, and there
/// is no output for the match group if there is no match.
#[derive(Debug, Clone, PartialEq, Default)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct VectorMatchFillValues {
pub rhs: Option<f64>,
pub lhs: Option<f64>,
}

impl VectorMatchFillValues {
pub fn new(lhs: f64, rhs: f64) -> Self {
Self {
rhs: Some(rhs),
lhs: Some(lhs),
}
}

pub fn with_rhs(mut self, rhs: f64) -> Self {
self.rhs = Some(rhs);
self
}

pub fn with_lhs(mut self, lhs: f64) -> Self {
self.lhs = Some(lhs);
self
}
}

/// Binary Expr Modifier
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
pub struct BinModifier {
/// The matching behavior for the operation if both operands are Vectors.
/// If they are not this field is None.
Expand All @@ -112,6 +142,9 @@ pub struct BinModifier {
pub matching: Option<LabelModifier>,
/// If a comparison operator, return 0/1 rather than filtering.
pub return_bool: bool,
/// Fill-in values to use when a series from one side does not find a match
/// on the other side.
pub fill_values: VectorMatchFillValues,
}

impl fmt::Display for BinModifier {
Expand All @@ -132,6 +165,21 @@ impl fmt::Display for BinModifier {
_ => (),
}

if self.fill_values.rhs.is_some() || self.fill_values.lhs.is_some() {
if self.fill_values.rhs == self.fill_values.lhs {
let fill_value = self.fill_values.rhs.unwrap();
write!(s, "fill ({fill_value}) ")?;
} else {
if let Some(fill_value) = self.fill_values.lhs {
write!(s, "fill_left ({fill_value}) ")?;
}

if let Some(fill_value) = self.fill_values.rhs {
write!(s, "fill_right ({fill_value}) ")?;
}
}
}

if s.trim().is_empty() {
write!(f, "")
} else {
Expand All @@ -146,6 +194,7 @@ impl Default for BinModifier {
card: VectorMatchCardinality::OneToOne,
matching: None,
return_bool: false,
fill_values: VectorMatchFillValues::default(),
}
}
}
Expand All @@ -166,6 +215,11 @@ impl BinModifier {
self
}

pub fn with_fill_values(mut self, fill_values: VectorMatchFillValues) -> Self {
self.fill_values = fill_values;
self
}

pub fn is_labels_joint(&self) -> bool {
matches!(
(self.card.labels(), &self.matching),
Expand Down Expand Up @@ -255,6 +309,7 @@ where
"include": [],
"labels": labels,
"on": true,
"fillValues": t.fill_values,
});
Comment thread
sunng87 marked this conversation as resolved.
map.serialize_value(&value)?;
}
Expand All @@ -264,6 +319,7 @@ where
"include": [],
"labels": labels,
"on": false,
"fillValues": t.fill_values,
});
map.serialize_value(&value)?;
}
Expand All @@ -274,6 +330,7 @@ where
"include": [],
"labels": [],
"on": false,
"fillValues": t.fill_values,
});
map.serialize_entry("matching", &value)?;
}
Expand Down Expand Up @@ -322,7 +379,7 @@ where
map.end()
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
pub enum Offset {
Pos(Duration),
Neg(Duration),
Expand Down Expand Up @@ -359,7 +416,7 @@ impl fmt::Display for Offset {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
pub enum AtModifier {
Start,
End,
Expand Down Expand Up @@ -487,7 +544,7 @@ impl fmt::Display for EvalStmt {
/// ```
///
/// parameter is only required for `count_values`, `quantile`, `topk` and `bottomk`.
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct AggregateExpr {
/// The used aggregation operation.
Expand Down Expand Up @@ -544,7 +601,7 @@ impl Prettier for AggregateExpr {
}

/// UnaryExpr will negate the expr
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
pub struct UnaryExpr {
pub expr: Box<Expr>,
}
Expand Down Expand Up @@ -587,7 +644,7 @@ impl serde::Serialize for UnaryExpr {
/// <vector expr> <bin-op> on(<label list>) group_left(<label list>) <vector expr>
/// <vector expr> <bin-op> on(<label list>) group_right(<label list>) <vector expr>
/// ```
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct BinaryExpr {
/// The operation of the expression.
Expand Down Expand Up @@ -658,7 +715,7 @@ impl Prettier for BinaryExpr {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct ParenExpr {
pub expr: Box<Expr>,
Expand All @@ -685,7 +742,7 @@ impl Prettier for ParenExpr {
/// ```norust
/// <instant_query> '[' <range> ':' [<resolution>] ']' [ @ <float_literal> ] [ offset <duration> ]
/// ```
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct SubqueryExpr {
pub expr: Box<Expr>,
Expand Down Expand Up @@ -805,7 +862,7 @@ impl Prettier for NumberLiteral {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct StringLiteral {
pub val: String,
Expand All @@ -823,7 +880,7 @@ impl Prettier for StringLiteral {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct VectorSelector {
pub name: Option<String>,
Expand Down Expand Up @@ -928,7 +985,7 @@ impl Prettier for VectorSelector {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct MatrixSelector {
#[cfg_attr(feature = "ser", serde(flatten))]
Expand Down Expand Up @@ -1010,7 +1067,7 @@ impl Prettier for MatrixSelector {
/// - sinh()
/// - tan()
/// - tanh()
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct Call {
pub func: Function,
Expand Down Expand Up @@ -1061,7 +1118,7 @@ impl PartialEq for Extension {

impl Eq for Extension {}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
#[cfg_attr(feature = "ser", serde(tag = "type", rename_all = "camelCase"))]
pub enum Expr {
Expand Down Expand Up @@ -1988,6 +2045,17 @@ mod tests {
("a - on(b) group_left c", "a - on (b) group_left () c"),
("a - ignoring(b) c", "a - ignoring (b) c"),
("a - ignoring() c", "a - c"),
("a + fill(-23) b", "a + fill (-23) b"),
("a + fill_left(-23) b", "a + fill_left (-23) b"),
("a + fill_right(42) b", "a + fill_right (42) b"),
(
"a + fill_left(-23) fill_right(42) b",
"a + fill_left (-23) fill_right (42) b",
),
(
"a + on(b) group_left fill(-23) c",
"a + on (b) group_left () fill (-23) c",
),
("up > bool 0", "up > bool 0"),
("a offset 1m", "a offset 1m"),
("a offset -7m", "a offset -7m"),
Expand Down
2 changes: 1 addition & 1 deletion src/parser/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::parser::{Expr, Prettier};
use crate::util::join_vector;

/// called by func in Call
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ser", derive(serde::Serialize))]
pub struct FunctionArgs {
pub args: Vec<Box<Expr>>,
Expand Down
94 changes: 92 additions & 2 deletions src/parser/lex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,32 @@ impl Lexer {
}

let s = self.lexeme_string();
match get_keyword_token(&s.to_lowercase()) {
Some(token_id) => State::Lexeme(token_id),
let s_lower = s.to_lowercase();
match get_keyword_token(&s_lower) {
Some(token_id) => {
// fill, fill_left, fill_right can be used as metric identifiers
// if not followed by a left parenthesis
if token_id == T_FILL || token_id == T_FILL_LEFT || token_id == T_FILL_RIGHT {
// Look ahead to see if next non-whitespace char is '('
let mut idx = self.ctx.idx;
let mut found_lparen = false;
while let Some(&ch) = self.ctx.chars.get(idx) {
if ch.is_ascii_whitespace() {
idx += 1;
} else if ch == '(' {
found_lparen = true;
break;
} else {
break;
}
}
if !found_lparen {
// Not followed by (, treat as metric identifier
return State::Lexeme(T_IDENTIFIER);
}
Comment thread
evenyag marked this conversation as resolved.
}
State::Lexeme(token_id)
}
None if s.contains(':') => State::Lexeme(T_METRIC_IDENTIFIER),
_ => State::Lexeme(T_IDENTIFIER),
}
Expand Down Expand Up @@ -940,6 +964,72 @@ mod tests {
("group_right", vec![(T_GROUP_RIGHT, 0, 11)], None),
("bool", vec![(T_BOOL, 0, 4)], None),
("atan2", vec![(T_ATAN2, 0, 5)], None),
// fill as metric identifier (not followed by ()
("fill", vec![(T_IDENTIFIER, 0, 4)], None),
("fill_left", vec![(T_IDENTIFIER, 0, 9)], None),
("fill_right", vec![(T_IDENTIFIER, 0, 10)], None),
Comment thread
evenyag marked this conversation as resolved.
// fill as modifier (followed by ()
(
"fill(1)",
vec![
(T_FILL, 0, 4),
(T_LEFT_PAREN, 4, 1),
(T_NUMBER, 5, 1),
(T_RIGHT_PAREN, 6, 1),
],
None,
),
(
"fill_left(1)",
vec![
(T_FILL_LEFT, 0, 9),
(T_LEFT_PAREN, 9, 1),
(T_NUMBER, 10, 1),
(T_RIGHT_PAREN, 11, 1),
],
None,
),
(
"fill_right(2)",
vec![
(T_FILL_RIGHT, 0, 10),
(T_LEFT_PAREN, 10, 1),
(T_NUMBER, 11, 1),
(T_RIGHT_PAREN, 12, 1),
],
None,
),
// fill with whitespace before (
(
"fill (1)",
vec![
(T_FILL, 0, 4),
(T_LEFT_PAREN, 5, 1),
(T_NUMBER, 6, 1),
(T_RIGHT_PAREN, 7, 1),
],
None,
),
(
"fill_left (1)",
vec![
(T_FILL_LEFT, 0, 9),
(T_LEFT_PAREN, 10, 1),
(T_NUMBER, 11, 1),
(T_RIGHT_PAREN, 12, 1),
],
None,
),
(
"fill_right (2)",
vec![
(T_FILL_RIGHT, 0, 10),
(T_LEFT_PAREN, 11, 1),
(T_NUMBER, 12, 1),
(T_RIGHT_PAREN, 13, 1),
],
None,
),
];
assert_matches(cases);
}
Expand Down
2 changes: 1 addition & 1 deletion src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub mod value;
pub use ast::{
AggregateExpr, AtModifier, BinModifier, BinaryExpr, Call, EvalStmt, Expr, Extension,
LabelModifier, MatrixSelector, NumberLiteral, Offset, ParenExpr, StringLiteral, SubqueryExpr,
UnaryExpr, VectorMatchCardinality, VectorSelector,
UnaryExpr, VectorMatchCardinality, VectorMatchFillValues, VectorSelector,
};
pub use function::{Function, FunctionArgs};
pub use lex::lexer;
Expand Down
Loading
Loading