5369f03464
* Pre: Expose more in edn. * Pre: Make it easier to work with ValueAndSpan. with_spans() is a temporary hack, needed only because I don't care to parse the bootstrap assertions from text right now. * Part 1a: Add `value_and_span` for parsing nested `edn::ValueAndSpan` instances. I wasn't able to abstract over `edn::Value` and `edn::ValueAndSpan`; there are multiple obstacles. I chose to roll with `edn::ValueAndSpan` since it exposes the additional span information that we will want to form good error messages in the future. * Part 1b: Add keyword_map() parsing an `edn::Value::Vector` into an `edn::Value::map`. * Part 1c: Add `Log`/`.log(...)` for logging parser progress. This is a terrible hack, but it sure helps to debug complicated nested parsers. I don't even know what a principled approach would look like; since our parser combinators are so frequently expressed in code, it's hard to imagine a data-driven interpreter that can help debug things. * Part 2: Use `value_and_span` apparatus in tx-parser/. I break an abstraction boundary by returning a value column `edn::ValueAndSpan` rather than just an `edn::Value`. That is, the transaction processor shouldn't care where the `edn::Value` it is processing arose -- even we care to track that information we should bake it into the `Entity` type. We do this because we need to dynamically parse the value column to support nested maps, and parsing requires a full `edn::ValueAndSpan`. Alternately, we could cheat and fake the spans when parsing nested maps, but that's potentially expensive. * Part 3: Use `value_and_span` apparatus in query-parser/. * Part 4: Use `value_and_span` apparatus in root crate. * Review comment: Make Span and SpanPosition Copy. * Review comment: nits. * Review comment: Make `or` be `or_exactly`. I baked the eof checking directly into the parser, rather than using the skip and eof parsers. I also took the time to restore some tests that were mistakenly commented out. * Review comment: Extract and use def_matches_* macros. * Review comment: .map() as late as possible.
211 lines
9.6 KiB
Rust
211 lines
9.6 KiB
Rust
// Copyright 2016 Mozilla
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
|
|
// this file except in compliance with the License. You may obtain a copy of the
|
|
// License at http://www.apache.org/licenses/LICENSE-2.0
|
|
// Unless required by applicable law or agreed to in writing, software distributed
|
|
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations under the License.
|
|
|
|
extern crate mentat_query_parser;
|
|
extern crate mentat_query;
|
|
extern crate edn;
|
|
|
|
use edn::{
|
|
NamespacedKeyword,
|
|
PlainSymbol,
|
|
};
|
|
|
|
use mentat_query::{
|
|
Element,
|
|
FindSpec,
|
|
FnArg,
|
|
OrJoin,
|
|
OrWhereClause,
|
|
Pattern,
|
|
PatternNonValuePlace,
|
|
PatternValuePlace,
|
|
Predicate,
|
|
UnifyVars,
|
|
Variable,
|
|
WhereClause,
|
|
};
|
|
|
|
use mentat_query_parser::parse_find_string;
|
|
|
|
///! N.B., parsing a query can be done without reference to a DB.
|
|
///! Processing the parsed query into something we can work with
|
|
///! for planning involves interrogating the schema and idents in
|
|
///! the store.
|
|
///! See <https://github.com/mozilla/mentat/wiki/Querying> for more.
|
|
#[test]
|
|
fn can_parse_predicates() {
|
|
let s = "[:find [?x ...] :where [?x _ ?y] [(< ?y 10)]]";
|
|
let p = parse_find_string(s).unwrap();
|
|
|
|
assert_eq!(p.find_spec,
|
|
FindSpec::FindColl(Element::Variable(Variable::from_valid_name("?x"))));
|
|
assert_eq!(p.where_clauses,
|
|
vec![
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::Variable(Variable::from_valid_name("?y")),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
}),
|
|
WhereClause::Pred(Predicate { operator: PlainSymbol::new("<"), args: vec![
|
|
FnArg::Variable(Variable::from_valid_name("?y")), FnArg::EntidOrInteger(10),
|
|
]}),
|
|
]);
|
|
}
|
|
|
|
#[test]
|
|
fn can_parse_simple_or() {
|
|
let s = "[:find ?x . :where (or [?x _ 10] [?x _ 15])]";
|
|
let p = parse_find_string(s).unwrap();
|
|
|
|
assert_eq!(p.find_spec,
|
|
FindSpec::FindScalar(Element::Variable(Variable::from_valid_name("?x"))));
|
|
assert_eq!(p.where_clauses,
|
|
vec![
|
|
WhereClause::OrJoin(OrJoin {
|
|
unify_vars: UnifyVars::Implicit,
|
|
clauses: vec![
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(10),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(15),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
],
|
|
}),
|
|
]);
|
|
}
|
|
|
|
#[test]
|
|
fn can_parse_unit_or_join() {
|
|
let s = "[:find ?x . :where (or-join [?x] [?x _ 15])]";
|
|
let p = parse_find_string(s).expect("to be able to parse find");
|
|
|
|
assert_eq!(p.find_spec,
|
|
FindSpec::FindScalar(Element::Variable(Variable::from_valid_name("?x"))));
|
|
assert_eq!(p.where_clauses,
|
|
vec![
|
|
WhereClause::OrJoin(OrJoin {
|
|
unify_vars: UnifyVars::Explicit(vec![Variable::from_valid_name("?x")]),
|
|
clauses: vec![
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(15),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
],
|
|
}),
|
|
]);
|
|
}
|
|
|
|
#[test]
|
|
fn can_parse_simple_or_join() {
|
|
let s = "[:find ?x . :where (or-join [?x] [?x _ 10] [?x _ 15])]";
|
|
let p = parse_find_string(s).unwrap();
|
|
|
|
assert_eq!(p.find_spec,
|
|
FindSpec::FindScalar(Element::Variable(Variable::from_valid_name("?x"))));
|
|
assert_eq!(p.where_clauses,
|
|
vec![
|
|
WhereClause::OrJoin(OrJoin {
|
|
unify_vars: UnifyVars::Explicit(vec![Variable::from_valid_name("?x")]),
|
|
clauses: vec![
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(10),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(15),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
],
|
|
}),
|
|
]);
|
|
}
|
|
|
|
#[cfg(test)]
|
|
fn ident(ns: &str, name: &str) -> PatternNonValuePlace {
|
|
PatternNonValuePlace::Ident(::std::rc::Rc::new(NamespacedKeyword::new(ns, name)))
|
|
}
|
|
|
|
#[test]
|
|
fn can_parse_simple_or_and_join() {
|
|
let s = "[:find ?x . :where (or [?x _ 10] (and (or [?x :foo/bar ?y] [?x :foo/baz ?y]) [(< ?y 1)]))]";
|
|
let p = parse_find_string(s).unwrap();
|
|
|
|
assert_eq!(p.find_spec,
|
|
FindSpec::FindScalar(Element::Variable(Variable::from_valid_name("?x"))));
|
|
assert_eq!(p.where_clauses,
|
|
vec![
|
|
WhereClause::OrJoin(OrJoin {
|
|
unify_vars: UnifyVars::Implicit,
|
|
clauses: vec![
|
|
OrWhereClause::Clause(
|
|
WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: PatternNonValuePlace::Placeholder,
|
|
value: PatternValuePlace::EntidOrInteger(10),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
OrWhereClause::And(
|
|
vec![
|
|
WhereClause::OrJoin(OrJoin {
|
|
unify_vars: UnifyVars::Implicit,
|
|
clauses: vec![
|
|
OrWhereClause::Clause(WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: ident("foo", "bar"),
|
|
value: PatternValuePlace::Variable(Variable::from_valid_name("?y")),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
OrWhereClause::Clause(WhereClause::Pattern(Pattern {
|
|
source: None,
|
|
entity: PatternNonValuePlace::Variable(Variable::from_valid_name("?x")),
|
|
attribute: ident("foo", "baz"),
|
|
value: PatternValuePlace::Variable(Variable::from_valid_name("?y")),
|
|
tx: PatternNonValuePlace::Placeholder,
|
|
})),
|
|
],
|
|
}),
|
|
|
|
WhereClause::Pred(Predicate { operator: PlainSymbol::new("<"), args: vec![
|
|
FnArg::Variable(Variable::from_valid_name("?y")), FnArg::EntidOrInteger(1),
|
|
]}),
|
|
],
|
|
)
|
|
],
|
|
}),
|
|
]);
|
|
}
|