2016-12-16 19:50:08 +00:00
|
|
|
// 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.
|
|
|
|
|
2017-12-11 19:08:10 +00:00
|
|
|
#![recursion_limit="128"]
|
|
|
|
|
Extract partial storage abstraction; use error-chain throughout. Fixes #328. r=rnewman (#341)
* Pre: Drop unneeded tx0 from search results.
* Pre: Don't require a schema in some of the DB code.
The idea is to separate the transaction applying code, which is
schema-aware, from the concrete storage code, which is just concerned
with getting bits onto disk.
* Pre: Only reference Schema, not DB, in debug module.
This is part of a larger separation of the volatile PartitionMap,
which is modified every transaction, from the stable Schema, which is
infrequently modified.
* Pre: Fix indentation.
* Extract part of DB to new SchemaTypeChecking trait.
* Extract part of DB to new PartitionMapping trait.
* Pre: Don't expect :db.part/tx partition to advance when tx fails.
This fails right now, because we allocate tx IDs even when we shouldn't.
* Sketch a db interface without DB.
* Add ValueParseError; use error-chain in tx-parser.
This can be simplified when
https://github.com/Marwes/combine/issues/86 makes it to a published
release, but this unblocks us for now. This converts the `combine`
error type `ParseError<&'a [edn::Value]>` to a type with owned
`Vec<edn::Value>` collections, re-using `edn::Value::Vector` for
making them `Display`.
* Pre: Accept Borrow<Schema> instead of just &Schema in debug module.
This makes it easy to use Rc<Schema> or Arc<Schema> without inserting
&* sigils throughout the code.
* Use error-chain in query-parser.
There are a few things to point out here:
- the fine grained error types have been flattened into one crate-wide
error type; it's pretty easy to regain the granularity as needed.
- edn::ParseError is automatically lifted to
mentat_query_parser::errors::Error;
- we use mentat_parser_utils::ValueParser to maintain parsing error
information from `combine`.
* Patch up top-level.
* Review comment: Only `borrow()` once.
2017-02-24 23:32:41 +00:00
|
|
|
#[macro_use]
|
2018-06-04 22:07:09 +00:00
|
|
|
extern crate failure_derive;
|
|
|
|
extern crate failure;
|
2017-02-24 05:16:19 +00:00
|
|
|
|
2018-01-23 16:43:26 +00:00
|
|
|
#[macro_use]
|
|
|
|
extern crate lazy_static;
|
|
|
|
|
2017-02-13 18:30:02 +00:00
|
|
|
extern crate rusqlite;
|
|
|
|
|
2018-02-16 09:44:28 +00:00
|
|
|
extern crate uuid;
|
|
|
|
|
2018-02-01 17:17:07 +00:00
|
|
|
pub extern crate edn;
|
2017-02-13 18:30:02 +00:00
|
|
|
extern crate mentat_core;
|
|
|
|
extern crate mentat_db;
|
2017-01-04 13:09:12 +00:00
|
|
|
extern crate mentat_query;
|
2017-02-03 23:52:02 +00:00
|
|
|
extern crate mentat_query_algebrizer;
|
2017-03-06 22:40:10 +00:00
|
|
|
extern crate mentat_query_projector;
|
2018-05-04 19:56:00 +00:00
|
|
|
extern crate mentat_query_pull;
|
2017-02-24 05:16:19 +00:00
|
|
|
extern crate mentat_query_translator;
|
|
|
|
extern crate mentat_sql;
|
2018-07-11 23:26:06 +00:00
|
|
|
|
|
|
|
#[cfg(feature = "syncable")]
|
2018-02-16 09:44:28 +00:00
|
|
|
extern crate mentat_tolstoy;
|
2017-01-06 16:24:04 +00:00
|
|
|
|
2017-05-03 22:49:29 +00:00
|
|
|
pub use mentat_core::{
|
2018-01-23 16:43:26 +00:00
|
|
|
Attribute,
|
2018-07-03 21:18:06 +00:00
|
|
|
Binding,
|
2018-03-20 19:16:32 +00:00
|
|
|
DateTime,
|
2018-07-03 21:18:06 +00:00
|
|
|
Entid,
|
2018-02-01 17:17:07 +00:00
|
|
|
HasSchema,
|
2018-05-11 16:52:17 +00:00
|
|
|
Keyword,
|
2018-07-03 21:18:06 +00:00
|
|
|
KnownEntid,
|
2018-02-14 00:51:21 +00:00
|
|
|
Schema,
|
2018-07-03 21:18:06 +00:00
|
|
|
StructuredMap,
|
2018-07-03 20:18:02 +00:00
|
|
|
TxReport,
|
2017-05-03 22:49:29 +00:00
|
|
|
TypedValue,
|
2018-03-20 19:16:32 +00:00
|
|
|
Utc,
|
2018-07-03 21:18:06 +00:00
|
|
|
Uuid,
|
2017-05-03 22:49:29 +00:00
|
|
|
ValueType,
|
2018-07-03 21:18:06 +00:00
|
|
|
now,
|
2017-05-03 22:49:29 +00:00
|
|
|
};
|
|
|
|
|
2018-01-30 22:11:41 +00:00
|
|
|
pub use mentat_query::{
|
|
|
|
FindSpec,
|
|
|
|
};
|
|
|
|
|
2017-03-06 22:40:10 +00:00
|
|
|
pub use mentat_db::{
|
2018-01-23 16:43:26 +00:00
|
|
|
CORE_SCHEMA_VERSION,
|
|
|
|
DB_SCHEMA_CORE,
|
2018-05-14 15:20:36 +00:00
|
|
|
AttributeSet,
|
2018-03-20 19:16:32 +00:00
|
|
|
TxObserver,
|
2017-03-06 22:40:10 +00:00
|
|
|
new_connection,
|
|
|
|
};
|
|
|
|
|
2018-06-13 15:49:40 +00:00
|
|
|
#[cfg(feature = "sqlcipher")]
|
|
|
|
pub use mentat_db::{
|
|
|
|
new_connection_with_key,
|
|
|
|
change_encryption_key,
|
|
|
|
};
|
|
|
|
|
2018-02-14 17:32:37 +00:00
|
|
|
/// Produce the appropriate `Variable` for the provided valid ?-prefixed name.
|
|
|
|
/// This lives here because we can't re-export macros:
|
|
|
|
/// https://github.com/rust-lang/rust/issues/29638.
|
|
|
|
#[macro_export]
|
|
|
|
macro_rules! var {
|
|
|
|
( ? $var:ident ) => {
|
|
|
|
$crate::Variable::from_valid_name(concat!("?", stringify!($var)))
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-11 16:52:17 +00:00
|
|
|
/// Produce the appropriate `Keyword` for the provided namespace and name.
|
2018-02-01 17:17:07 +00:00
|
|
|
/// This lives here because we can't re-export macros:
|
|
|
|
/// https://github.com/rust-lang/rust/issues/29638.
|
|
|
|
#[macro_export]
|
|
|
|
macro_rules! kw {
|
2018-07-06 21:18:48 +00:00
|
|
|
( : $ns:ident$(. $nss:ident)+ / $nn:ident$(. $nns:ident)+ ) => {
|
|
|
|
$crate::Keyword::namespaced(
|
|
|
|
concat!(stringify!($ns) $(, ".", stringify!($nss))*),
|
|
|
|
concat!(stringify!($nn) $(, ".", stringify!($nns))*),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
( : $ns:ident$(. $nss:ident)+ / $nn:ident ) => {
|
|
|
|
$crate::Keyword::namespaced(
|
|
|
|
concat!(stringify!($ns) $(, ".", stringify!($nss))*),
|
|
|
|
stringify!($nn)
|
2018-05-11 16:52:17 +00:00
|
|
|
)
|
|
|
|
};
|
|
|
|
|
2018-07-06 21:18:48 +00:00
|
|
|
( : $ns:ident / $nn:ident$(. $nns:ident)+ ) => {
|
2018-05-11 16:52:17 +00:00
|
|
|
$crate::Keyword::namespaced(
|
|
|
|
stringify!($ns),
|
2018-07-06 21:18:48 +00:00
|
|
|
concat!(stringify!($nn) $(, ".", stringify!($nns))*),
|
2018-05-11 16:52:17 +00:00
|
|
|
)
|
2018-02-01 17:17:07 +00:00
|
|
|
};
|
|
|
|
|
2018-07-06 21:18:48 +00:00
|
|
|
( : $ns:ident / $nn:ident ) => {
|
2018-05-11 16:52:17 +00:00
|
|
|
$crate::Keyword::namespaced(
|
2018-07-06 21:18:48 +00:00
|
|
|
stringify!($ns),
|
|
|
|
stringify!($nn)
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
( : $n:ident ) => {
|
|
|
|
$crate::Keyword::plain(
|
2018-05-11 16:52:17 +00:00
|
|
|
stringify!($n)
|
|
|
|
)
|
2018-02-01 17:17:07 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-06-04 22:07:09 +00:00
|
|
|
#[macro_use]
|
|
|
|
pub mod errors;
|
2018-06-27 20:19:40 +00:00
|
|
|
pub use errors::{
|
|
|
|
MentatError,
|
|
|
|
Result,
|
|
|
|
};
|
2018-06-27 21:05:41 +00:00
|
|
|
|
2018-07-03 21:18:06 +00:00
|
|
|
pub use edn::{
|
|
|
|
FromMicros,
|
|
|
|
FromMillis,
|
|
|
|
ParseError,
|
|
|
|
ToMicros,
|
|
|
|
ToMillis,
|
|
|
|
};
|
2018-06-27 21:05:41 +00:00
|
|
|
pub use mentat_db::DbError;
|
|
|
|
pub use mentat_query_algebrizer::AlgebrizerError;
|
Part 2: Make it easier to match tuple results.
Right now, we write code like
```rust
match q_once(q, inputs)?.into_tuple()? {
Some(vs) => match (vs.len(), vs.get(0), vs.get(1)) {
(2, &Some(Binding::Scalar(TypedValue::Long(a))), &Some(Binding::Scalar(TypedValue::Instant(ref b)))) => Some((a, b.clone())),
_ => panic!(),
},
None => None,
}
```
to length-check tuples coming out of the database. It can also lead
to a lot of cloning because references are the easiest thing to hand.
This commit allows to write code like
```rust
match q_once(q, inputs)?.into_tuple()? {
Some((Binding::Scalar(TypedValue::Long(a)), Binding::Scalar(TypedValue::Instant(b)))) => Some((a, b)),
Some(_) => panic!(),
None => None,
}
```
which is generally much easier to reason about.
2018-06-28 19:15:26 +00:00
|
|
|
pub use mentat_query_projector::{
|
|
|
|
BindingTuple,
|
|
|
|
ProjectorError,
|
|
|
|
};
|
2018-06-27 21:05:41 +00:00
|
|
|
pub use mentat_query_pull::PullError;
|
|
|
|
pub use mentat_sql::SQLError;
|
|
|
|
|
2018-05-16 16:27:33 +00:00
|
|
|
pub mod conn;
|
|
|
|
pub mod entity_builder;
|
2018-02-01 17:17:07 +00:00
|
|
|
pub mod query;
|
2018-04-05 10:09:13 +00:00
|
|
|
pub mod query_builder;
|
2018-05-16 16:27:33 +00:00
|
|
|
pub mod store;
|
|
|
|
pub mod vocabulary;
|
2018-02-01 17:17:07 +00:00
|
|
|
|
2017-03-06 22:40:10 +00:00
|
|
|
pub use query::{
|
2018-01-23 16:23:37 +00:00
|
|
|
IntoResult,
|
2017-03-06 22:40:10 +00:00
|
|
|
PlainSymbol,
|
2018-02-01 17:17:07 +00:00
|
|
|
QueryExecutionResult,
|
2018-01-20 00:44:39 +00:00
|
|
|
QueryExplanation,
|
2017-04-17 20:14:30 +00:00
|
|
|
QueryInputs,
|
2018-01-30 22:11:41 +00:00
|
|
|
QueryOutput,
|
2018-01-20 00:44:39 +00:00
|
|
|
QueryPlanStep,
|
2017-03-06 22:40:10 +00:00
|
|
|
QueryResults,
|
2018-04-24 22:04:00 +00:00
|
|
|
RelResult,
|
2017-04-17 20:14:30 +00:00
|
|
|
Variable,
|
2017-03-06 22:40:10 +00:00
|
|
|
q_once,
|
|
|
|
};
|
|
|
|
|
2018-04-05 10:09:13 +00:00
|
|
|
pub use query_builder::{
|
|
|
|
QueryBuilder,
|
|
|
|
};
|
|
|
|
|
2017-05-03 22:49:29 +00:00
|
|
|
pub use conn::{
|
2018-02-14 00:51:21 +00:00
|
|
|
CacheAction,
|
|
|
|
CacheDirection,
|
2017-05-03 22:49:29 +00:00
|
|
|
Conn,
|
2018-01-23 16:43:26 +00:00
|
|
|
InProgress,
|
2017-05-03 22:49:29 +00:00
|
|
|
Metadata,
|
2018-05-04 19:56:00 +00:00
|
|
|
Pullable,
|
2018-01-23 16:31:27 +00:00
|
|
|
Queryable,
|
2018-02-16 09:44:28 +00:00
|
|
|
Syncable,
|
2018-05-16 16:27:33 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
pub use store::{
|
2018-01-30 22:11:41 +00:00
|
|
|
Store,
|
2017-05-03 22:49:29 +00:00
|
|
|
};
|
|
|
|
|
2016-12-16 18:39:08 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2017-01-11 21:51:34 +00:00
|
|
|
use edn::symbols::Keyword;
|
2018-02-01 17:17:07 +00:00
|
|
|
use super::*;
|
2016-12-21 16:55:00 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn can_import_edn() {
|
2018-05-11 16:52:17 +00:00
|
|
|
assert_eq!(":foo", &Keyword::plain("foo").to_string());
|
2016-12-21 16:55:00 +00:00
|
|
|
}
|
2018-02-01 17:17:07 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_kw() {
|
2018-05-11 16:52:17 +00:00
|
|
|
assert_eq!(kw!(:foo/bar), Keyword::namespaced("foo", "bar"));
|
|
|
|
assert_eq!(kw!(:org.mozilla.foo/bar_baz), Keyword::namespaced("org.mozilla.foo", "bar_baz"));
|
2018-07-06 21:18:48 +00:00
|
|
|
assert_eq!(kw!(:_foo_/_bar_._baz_), Keyword::namespaced("_foo_", "_bar_._baz_"));
|
|
|
|
assert_eq!(kw!(:_org_._mozilla_._foo_/_bar_._baz_), Keyword::namespaced("_org_._mozilla_._foo_", "_bar_._baz_"));
|
2018-02-01 17:17:07 +00:00
|
|
|
}
|
2018-02-14 17:32:37 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_var() {
|
|
|
|
let foo_baz = var!(?foo_baz);
|
|
|
|
let vu = var!(?vü);
|
|
|
|
assert_eq!(foo_baz, Variable::from_valid_name("?foo_baz"));
|
|
|
|
assert_eq!(vu, Variable::from_valid_name("?vü"));
|
|
|
|
assert_eq!(foo_baz.as_str(), "?foo_baz");
|
|
|
|
}
|
2017-01-07 01:19:21 +00:00
|
|
|
}
|