fluidB
/
fluidb
1
0
Fork 0
Code Pull Requests Activity

add more params to Eval

Browse Source
main
Ziyang Hu 2 years ago
parent eceab71fcd
commit 7a735269b5
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File

69
src/db/eval.rs
Unescape Escape View File

@ -262,7 +262,7 @@ impl<'s, 't> Session<'s, 't> {
}
self.define_data(&name, tuple, in_root)
}
pub fn partial_eval<'a>(&self, value: Value<'a>) -> Result<(bool, Value<'a>)> {
pub fn partial_eval<'a>(&self, value: Value<'a>, params: BTreeMap<String, Value>, table_bindings: BTreeMap<String, ()>) -> Result<(bool, Value<'a>)> {
match value {
v @ (Value::Null |
Value::Bool(_) |
@ -275,7 +275,7 @@ impl<'s, 't> Session<'s, 't> {
let init_vec = Vec::with_capacity(l.len());
let res: Result<(bool, Vec<Value>)> = l.into_iter()
.try_fold((true, init_vec), |(is_evaluated, mut accum), val| {
let (ev, new_val) = self.partial_eval(val)?;
let (ev, new_val) = self.partial_eval(val, Default::default(), Default::default())?;
accum.push(new_val);
Ok((ev && is_evaluated, accum))
});
@ -285,7 +285,7 @@ impl<'s, 't> Session<'s, 't> {
Value::Dict(d) => {
let res: Result<(bool, BTreeMap<Cow<str>, Value>)> = d.into_iter()
.try_fold((true, BTreeMap::new()), |(is_evaluated, mut accum), (k, v)| {
let (ev, new_val) = self.partial_eval(v)?;
let (ev, new_val) = self.partial_eval(v, Default::default(), Default::default())?;
accum.insert(k, new_val);
Ok((ev && is_evaluated, accum))
});
@ -328,7 +328,7 @@ impl<'s, 't> Session<'s, 't> {
fn coalesce_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let res = args.into_iter().try_fold(vec![], |mut accum, cur| {
match self.partial_eval(cur) {
match self.partial_eval(cur, Default::default(), Default::default()) {
Ok((ev, cur)) => {
if ev {
if cur == Value::Null {
@ -359,8 +359,8 @@ impl<'s, 't> Session<'s, 't> {
fn add_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -378,8 +378,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn sub_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -396,7 +396,7 @@ impl<'s, 't> Session<'s, 't> {
}
fn minus_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null {
return Ok((true, Value::Null));
}
@ -411,7 +411,7 @@ impl<'s, 't> Session<'s, 't> {
}
fn negate_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null {
return Ok((true, Value::Null));
}
@ -425,8 +425,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn pow_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -443,8 +443,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn gt_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -461,8 +461,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn lt_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -479,8 +479,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn ge_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -497,8 +497,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn le_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -515,8 +515,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn mod_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -530,8 +530,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn mul_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -548,8 +548,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn div_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -566,8 +566,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn eq_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -578,8 +578,8 @@ impl<'s, 't> Session<'s, 't> {
}
fn ne_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let mut args = args.into_iter();
let (le, left) = self.partial_eval(args.next().unwrap())?;
let (re, right) = self.partial_eval(args.next().unwrap())?;
let (le, left) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
let (re, right) = self.partial_eval(args.next().unwrap(), Default::default(), Default::default())?;
if left == Value::Null || right == Value::Null {
return Ok((true, Value::Null));
}
@ -589,7 +589,7 @@ impl<'s, 't> Session<'s, 't> {
Ok((true, (left != right).into()))
}
fn or_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let res = args.into_iter().map(|v| self.partial_eval(v))
let res = args.into_iter().map(|v| self.partial_eval(v, Default::default(), Default::default()))
.try_fold(
(true, false, vec![]),
|(is_evaluated, has_null, mut collected), x| {
@ -649,7 +649,7 @@ impl<'s, 't> Session<'s, 't> {
}
}
fn and_values<'a>(&self, args: Vec<Value<'a>>) -> Result<(bool, Value<'a>)> {
let res = args.into_iter().map(|v| self.partial_eval(v))
let res = args.into_iter().map(|v| self.partial_eval(v, Default::default(), Default::default()))
.try_fold(
(true, false, vec![]),
|(is_evaluated, has_null, mut collected), x| {
@ -1050,7 +1050,10 @@ mod tests {
let sess = engine.session().unwrap();
let parse_expr_from_str = |s: &str| -> (bool, Value) {
let (b, v) = sess.partial_eval(Value::from_pair(Parser::parse(Rule::expr, s).unwrap().next().unwrap()).unwrap()).unwrap();
let (b, v) = sess.partial_eval(
Value::from_pair(Parser::parse(Rule::expr, s)
.unwrap().next().unwrap()).unwrap(),
Default::default(), Default::default()).unwrap();
(b, v.to_static())
};

6
src/db/mutation.rs
Unescape Escape View File

@ -43,7 +43,9 @@ impl<'a, 't> Session<'a, 't> {
Rule::insert => MutationKind::Insert,
_ => unreachable!()
};
let (evaluated, expr) = self.partial_eval(Value::from_pair(pairs.next().unwrap())?)?;
let (evaluated, expr) = self.partial_eval(
Value::from_pair(pairs.next().unwrap())?,
Default::default(), Default::default())?;
if !evaluated {
return Err(LogicError("Mutation encountered unevaluated expression".to_string()));
}
@ -312,7 +314,6 @@ mod tests {
sess.commit().unwrap();
let duration = start.elapsed();
println!("Time elapsed {:?}", duration);
}
{
@ -335,7 +336,6 @@ mod tests {
println!("K: {:?}, V: {:?}", Tuple::new(k), Tuple::new(v));
}
println!("Time elapsed {:?}", duration);
}
drop(engine);

Write Preview
Loading…
Cancel
Save