Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/asap-aware-mapping/src/query_physical_lowering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ fn promql_binary_operation(
BinaryOpKind::Set(PromQLVectorSetOpKind::And) => PromqlBinaryOperation::And,
BinaryOpKind::Set(PromQLVectorSetOpKind::Or) => PromqlBinaryOperation::Or,
BinaryOpKind::Set(PromQLVectorSetOpKind::Unless) => PromqlBinaryOperation::Unless,
BinaryOpKind::Arithmetic(_) | BinaryOpKind::Compare(_) => {
BinaryOpKind::Arithmetic(_) | BinaryOpKind::Compare(_) | BinaryOpKind::CompareBool(_) => {
PromqlBinaryOperation::ArithmeticOrComparison
}
}
Expand Down
33 changes: 23 additions & 10 deletions crates/asap-physical-operators/src/expressions/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn evaluate_binary(
right: f64,
) -> Result<crate::values::Value, crate::Error> {
use crate::{values::Value, Error};
use planner_types::pre_asap::{ArithmeticOpKind, BinaryOpKind, CompareOpKind};
use planner_types::pre_asap::{ArithmeticOpKind, BinaryOpKind};
let invalid =
|| Error::Invalid("unsupported binary operation or invalid checked-division domain".into());
if operator.vector_match.is_some() {
Expand All @@ -49,15 +49,28 @@ pub fn evaluate_binary(
BinaryOpKind::Arithmetic(ref op) => {
Value::Float64(evaluate_float64_arithmetic(op, left, right))
}
BinaryOpKind::Compare(ref op) => Value::Bool(match op {
CompareOpKind::Eq => left == right,
CompareOpKind::Ne => left != right,
CompareOpKind::Lt => left < right,
CompareOpKind::Le => left <= right,
CompareOpKind::Gt => left > right,
CompareOpKind::Ge => left >= right,
_ => return Err(invalid()),
}),
BinaryOpKind::Compare(ref op) => Value::Bool(compare(op, left, right).ok_or_else(invalid)?),
BinaryOpKind::CompareBool(ref op) => {
Value::Float64(if compare(op, left, right).ok_or_else(invalid)? {
1.
} else {
0.
})
}
_ => return Err(invalid()),
})
}

/// IEEE comparison, as Go's: NaN is unequal to everything, itself included.
fn compare(op: &planner_types::pre_asap::CompareOpKind, left: f64, right: f64) -> Option<bool> {
use planner_types::pre_asap::CompareOpKind;
Some(match op {
CompareOpKind::Eq => left == right,
CompareOpKind::Ne => left != right,
CompareOpKind::Lt => left < right,
CompareOpKind::Le => left <= right,
CompareOpKind::Gt => left > right,
CompareOpKind::Ge => left >= right,
_ => return None,
})
}
8 changes: 8 additions & 0 deletions crates/asap-physical-operators/src/expressions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ impl Expression {
| CompareOpKind::Gt
| CompareOpKind::Ge,
) => DataType::Bool,
BinaryOpKind::CompareBool(
CompareOpKind::Eq
| CompareOpKind::Ne
| CompareOpKind::Lt
| CompareOpKind::Le
| CompareOpKind::Gt
| CompareOpKind::Ge,
) => DataType::Float64,
_ => return Err(invalid("unsupported binary operation")),
};
Ok((dtype, n || m))
Expand Down
1 change: 1 addition & 0 deletions crates/asap-physical-operators/src/operators/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ enum Kind {
},
SeriesBinary {
operator: planner_types::post_asap::BinaryOperator,
scalars: [bool; 2],
},
Project(Vec<Expression>),
Filter(Expression),
Expand Down
Loading
Loading