difftreelog
perf add string extension threshold
in: master
2 files changed
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth1use std::cmp::Ordering;23use jrsonnet_parser::{BinaryOpType, LocExpr, UnaryOpType};45use crate::{6 arr::ArrValue,7 error::ErrorKind::*,8 evaluate,9 stdlib::std_format,10 throw,11 typed::Typed,12 val::{equals, StrValue},13 Context, Result, Val,14};1516pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {17 use UnaryOpType::*;18 use Val::*;19 Ok(match (op, b) {20 (Not, Bool(v)) => Bool(!v),21 (Minus, Num(n)) => Num(-*n),22 (BitNot, Num(n)) => Num(f64::from(!(*n as i32))),23 (op, o) => throw!(UnaryOperatorDoesNotOperateOnType(op, o.value_type())),24 })25}2627/// Arbitrary threshold2829pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {30 use Val::*;31 Ok(match (a, b) {32 (Str(a), Str(b)) if a.is_empty() => Val::Str(b.clone()),33 (Str(a), Str(b)) if b.is_empty() => Val::Str(a.clone()),34 (Str(v1), Str(v2)) => Str(StrValue::concat(v1.clone(), v2.clone())),3536 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)37 (Num(a), Str(b)) => Str(StrValue::Flat(format!("{a}{b}").into())),38 (Str(a), Num(b)) => Str(StrValue::Flat(format!("{a}{b}").into())),3940 (Str(a), o) | (o, Str(a)) if a.is_empty() => {41 Val::Str(StrValue::Flat(o.clone().to_string()?))42 }43 (Str(a), o) => Str(StrValue::Flat(44 format!("{a}{}", o.clone().to_string()?).into(),45 )),46 (o, Str(a)) => Str(StrValue::Flat(47 format!("{}{a}", o.clone().to_string()?).into(),48 )),4950 (Obj(v1), Obj(v2)) => Obj(v2.extend_from(v1.clone())),51 (Arr(a), Arr(b)) => Val::Arr(ArrValue::extended(a.clone(), b.clone())),5253 (Num(v1), Num(v2)) => Val::new_checked_num(v1 + v2)?,54 _ => throw!(BinaryOperatorDoesNotOperateOnValues(55 BinaryOpType::Add,56 a.value_type(),57 b.value_type(),58 )),59 })60}6162pub fn evaluate_mod_op(a: &Val, b: &Val) -> Result<Val> {63 use Val::*;64 match (a, b) {65 (Num(a), Num(b)) => {66 if *b == 0.0 {67 throw!(DivisionByZero)68 }69 Ok(Num(a % b))70 }71 (Str(str), vals) => {72 String::into_untyped(std_format(&str.clone().into_flat(), vals.clone())?)73 }74 (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(75 BinaryOpType::Mod,76 a.value_type(),77 b.value_type()78 )),79 }80}8182pub fn evaluate_binary_op_special(83 ctx: Context,84 a: &LocExpr,85 op: BinaryOpType,86 b: &LocExpr,87) -> Result<Val> {88 use BinaryOpType::*;89 use Val::*;90 Ok(match (evaluate(ctx.clone(), a)?, op, b) {91 (Bool(true), Or, _o) => Val::Bool(true),92 (Bool(false), And, _o) => Val::Bool(false),93 (a, op, eb) => evaluate_binary_op_normal(&a, op, &evaluate(ctx, eb)?)?,94 })95}9697pub fn evaluate_compare_op(a: &Val, b: &Val, op: BinaryOpType) -> Result<Ordering> {98 use Val::*;99 Ok(match (a, b) {100 (Str(a), Str(b)) => a.cmp(b),101 (Num(a), Num(b)) => a.partial_cmp(b).expect("jsonnet numbers are non NaN"),102 (Arr(a), Arr(b)) => {103 let ai = a.iter();104 let bi = b.iter();105106 for (a, b) in ai.zip(bi) {107 let ord = evaluate_compare_op(&a?, &b?, op)?;108 if !ord.is_eq() {109 return Ok(ord);110 }111 }112113 a.len().cmp(&b.len())114 }115 (_, _) => throw!(BinaryOperatorDoesNotOperateOnValues(116 op,117 a.value_type(),118 b.value_type()119 )),120 })121}122123pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {124 use BinaryOpType::*;125 use Val::*;126 Ok(match (a, op, b) {127 (a, Add, b) => evaluate_add_op(a, b)?,128129 (a, Eq, b) => Bool(equals(a, b)?),130 (a, Neq, b) => Bool(!equals(a, b)?),131132 (a, Lt, b) => Bool(evaluate_compare_op(a, b, Lt)?.is_lt()),133 (a, Gt, b) => Bool(evaluate_compare_op(a, b, Gt)?.is_gt()),134 (a, Lte, b) => Bool(evaluate_compare_op(a, b, Lte)?.is_le()),135 (a, Gte, b) => Bool(evaluate_compare_op(a, b, Gte)?.is_ge()),136137 (Str(a), In, Obj(obj)) => Bool(obj.has_field_ex(a.clone().into_flat(), true)),138 (a, Mod, b) => evaluate_mod_op(a, b)?,139140 (Str(v1), Mul, Num(v2)) => Str(StrValue::Flat(v1.to_string().repeat(*v2 as usize).into())),141142 // Bool X Bool143 (Bool(a), And, Bool(b)) => Bool(*a && *b),144 (Bool(a), Or, Bool(b)) => Bool(*a || *b),145146 // Num X Num147 (Num(v1), Mul, Num(v2)) => Val::new_checked_num(v1 * v2)?,148 (Num(v1), Div, Num(v2)) => {149 if *v2 == 0.0 {150 throw!(DivisionByZero)151 }152 Val::new_checked_num(v1 / v2)?153 }154155 (Num(v1), Sub, Num(v2)) => Val::new_checked_num(v1 - v2)?,156157 (Num(v1), BitAnd, Num(v2)) => Num(f64::from((*v1 as i32) & (*v2 as i32))),158 (Num(v1), BitOr, Num(v2)) => Num(f64::from((*v1 as i32) | (*v2 as i32))),159 (Num(v1), BitXor, Num(v2)) => Num(f64::from((*v1 as i32) ^ (*v2 as i32))),160 (Num(v1), Lhs, Num(v2)) => {161 if *v2 < 0.0 {162 throw!("shift by negative exponent")163 }164 Num(f64::from((*v1 as i32) << (*v2 as i32)))165 }166 (Num(v1), Rhs, Num(v2)) => {167 if *v2 < 0.0 {168 throw!("shift by negative exponent")169 }170 Num(f64::from((*v1 as i32) >> (*v2 as i32)))171 }172173 _ => throw!(BinaryOperatorDoesNotOperateOnValues(174 op,175 a.value_type(),176 b.value_type(),177 )),178 })179}crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -199,34 +199,40 @@
}
impl StrValue {
pub fn concat(a: StrValue, b: StrValue) -> Self {
+ // TODO: benchmark for an optimal value, currently just a arbitrary choice
+ const STRING_EXTEND_THRESHOLD: usize = 100;
+
if a.is_empty() {
b
} else if b.is_empty() {
a
+ } else if a.len() + b.len() < STRING_EXTEND_THRESHOLD {
+ Self::Flat(format!("{a}{b}").into())
} else {
let len = a.len() + b.len();
Self::Tree(Rc::new((a, b, len)))
}
}
pub fn into_flat(self) -> IStr {
+ #[cold]
+ fn write_buf(s: &StrValue, out: &mut String) {
+ match s {
+ StrValue::Flat(f) => out.push_str(f),
+ StrValue::Tree(t) => {
+ write_buf(&t.0, out);
+ write_buf(&t.1, out);
+ }
+ }
+ }
match self {
StrValue::Flat(f) => f,
StrValue::Tree(_) => {
- let mut buf = String::new();
- self.into_flat_buf(&mut buf);
+ let mut buf = String::with_capacity(self.len());
+ write_buf(&self, &mut buf);
buf.into()
}
}
}
- fn into_flat_buf(&self, out: &mut String) {
- match self {
- StrValue::Flat(f) => out.push_str(f),
- StrValue::Tree(t) => {
- t.0.into_flat_buf(out);
- t.1.into_flat_buf(out);
- }
- }
- }
pub fn len(&self) -> usize {
match self {
StrValue::Flat(v) => v.len(),
@@ -236,7 +242,8 @@
pub fn is_empty(&self) -> bool {
match self {
Self::Flat(v) => v.is_empty(),
- _ => false,
+ // Can't create non-flat empty string
+ Self::Tree(_) => false,
}
}
}