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
|
|
|
// 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.
|
|
|
|
|
|
|
|
#![allow(dead_code)]
|
|
|
|
|
2018-06-04 22:07:09 +00:00
|
|
|
use std; // To refer to std::result::Result.
|
2018-02-16 09:44:28 +00:00
|
|
|
|
2017-04-17 20:14:30 +00:00
|
|
|
use std::collections::BTreeSet;
|
|
|
|
|
2018-06-27 20:19:40 +00:00
|
|
|
use rusqlite;
|
|
|
|
|
|
|
|
use edn;
|
2018-06-04 22:07:09 +00:00
|
|
|
|
2018-08-08 17:36:41 +00:00
|
|
|
use core_traits::{
|
2018-01-23 16:43:26 +00:00
|
|
|
Attribute,
|
2018-08-08 21:19:27 +00:00
|
|
|
ValueType,
|
2018-01-23 16:43:26 +00:00
|
|
|
};
|
2018-06-04 22:07:09 +00:00
|
|
|
|
2018-08-08 17:37:59 +00:00
|
|
|
use db_traits::errors::DbError;
|
2018-08-08 18:56:27 +00:00
|
|
|
use query_algebrizer_traits::errors::{
|
|
|
|
AlgebrizerError,
|
|
|
|
};
|
2018-08-08 19:37:25 +00:00
|
|
|
use query_projector_traits::errors::{
|
|
|
|
ProjectorError,
|
|
|
|
};
|
2018-08-08 18:01:09 +00:00
|
|
|
use query_pull_traits::errors::{
|
|
|
|
PullError,
|
|
|
|
};
|
2018-08-08 20:19:08 +00:00
|
|
|
use sql_traits::errors::{
|
|
|
|
SQLError,
|
|
|
|
};
|
2018-07-11 23:26:06 +00:00
|
|
|
|
|
|
|
#[cfg(feature = "syncable")]
|
2018-08-08 21:33:53 +00:00
|
|
|
use tolstoy_traits::errors::{
|
|
|
|
TolstoyError,
|
|
|
|
};
|
2018-06-04 22:07:09 +00:00
|
|
|
|
2018-06-27 20:19:40 +00:00
|
|
|
pub type Result<T> = std::result::Result<T, MentatError>;
|
2018-06-04 22:07:09 +00:00
|
|
|
|
|
|
|
#[macro_export]
|
|
|
|
macro_rules! bail {
|
|
|
|
($e:expr) => (
|
|
|
|
return Err($e.into());
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Fail)]
|
|
|
|
pub enum MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
#[fail(display = "bad uuid {}", _0)]
|
|
|
|
BadUuid(String),
|
|
|
|
|
2018-06-04 22:07:09 +00:00
|
|
|
#[fail(display = "path {} already exists", _0)]
|
|
|
|
PathAlreadyExists(String),
|
|
|
|
|
|
|
|
#[fail(display = "variables {:?} unbound at query execution time", _0)]
|
|
|
|
UnboundVariables(BTreeSet<String>),
|
|
|
|
|
|
|
|
#[fail(display = "invalid argument name: '{}'", _0)]
|
|
|
|
InvalidArgumentName(String),
|
|
|
|
|
|
|
|
#[fail(display = "unknown attribute: '{}'", _0)]
|
|
|
|
UnknownAttribute(String),
|
|
|
|
|
|
|
|
#[fail(display = "invalid vocabulary version")]
|
|
|
|
InvalidVocabularyVersion,
|
|
|
|
|
2018-08-08 21:59:52 +00:00
|
|
|
#[fail(display = "vocabulary {}/version {} already has attribute {}, and the requested definition differs", _0, _1, _2)]
|
|
|
|
ConflictingAttributeDefinitions(String, u32, String, Attribute, Attribute),
|
2018-06-04 22:07:09 +00:00
|
|
|
|
2018-08-08 21:59:52 +00:00
|
|
|
#[fail(display = "existing vocabulary {} too new: wanted version {}, got version {}", _0, _1, _2)]
|
|
|
|
ExistingVocabularyTooNew(String, u32, u32),
|
2018-06-04 22:07:09 +00:00
|
|
|
|
2018-08-08 21:59:52 +00:00
|
|
|
#[fail(display = "core schema: wanted version {}, got version {:?}", _0, _1)]
|
|
|
|
UnexpectedCoreSchema(u32, Option<u32>),
|
2018-06-04 22:07:09 +00:00
|
|
|
|
|
|
|
#[fail(display = "Lost the transact() race!")]
|
|
|
|
UnexpectedLostTransactRace,
|
|
|
|
|
|
|
|
#[fail(display = "missing core attribute {}", _0)]
|
2018-08-08 18:23:07 +00:00
|
|
|
MissingCoreVocabulary(edn::query::Keyword),
|
2018-06-04 22:07:09 +00:00
|
|
|
|
|
|
|
#[fail(display = "schema changed since query was prepared")]
|
|
|
|
PreparedQuerySchemaMismatch,
|
|
|
|
|
|
|
|
#[fail(display = "provided value of type {} doesn't match attribute value type {}", _0, _1)]
|
|
|
|
ValueTypeMismatch(ValueType, ValueType),
|
2018-06-27 20:19:40 +00:00
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
|
|
|
IoError(#[cause] std::io::Error),
|
|
|
|
|
|
|
|
// It would be better to capture the underlying `rusqlite::Error`, but that type doesn't
|
|
|
|
// implement many useful traits, including `Clone`, `Eq`, and `PartialEq`.
|
2018-06-29 21:40:56 +00:00
|
|
|
#[fail(display = "SQL error: {}", _0)]
|
2018-06-27 20:19:40 +00:00
|
|
|
RusqliteError(String),
|
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
|
|
|
EdnParseError(#[cause] edn::ParseError),
|
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 17:37:59 +00:00
|
|
|
DbError(#[cause] DbError),
|
2018-06-27 20:19:40 +00:00
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 18:56:27 +00:00
|
|
|
AlgebrizerError(#[cause] AlgebrizerError),
|
2018-06-27 20:19:40 +00:00
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 19:37:25 +00:00
|
|
|
ProjectorError(#[cause] ProjectorError),
|
2018-06-27 20:19:40 +00:00
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 18:01:09 +00:00
|
|
|
PullError(#[cause] PullError),
|
2018-06-27 20:19:40 +00:00
|
|
|
|
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 20:19:08 +00:00
|
|
|
SQLError(#[cause] SQLError),
|
2018-06-29 04:47:19 +00:00
|
|
|
|
2018-07-11 23:26:06 +00:00
|
|
|
#[cfg(feature = "syncable")]
|
2018-06-29 04:47:19 +00:00
|
|
|
#[fail(display = "{}", _0)]
|
2018-08-08 21:33:53 +00:00
|
|
|
TolstoyError(#[cause] TolstoyError),
|
2018-06-27 20:19:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl From<std::io::Error> for MentatError {
|
|
|
|
fn from(error: std::io::Error) -> MentatError {
|
|
|
|
MentatError::IoError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<rusqlite::Error> for MentatError {
|
|
|
|
fn from(error: rusqlite::Error) -> MentatError {
|
|
|
|
MentatError::RusqliteError(error.to_string())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<edn::ParseError> for MentatError {
|
|
|
|
fn from(error: edn::ParseError) -> MentatError {
|
|
|
|
MentatError::EdnParseError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-08 17:37:59 +00:00
|
|
|
impl From<DbError> for MentatError {
|
|
|
|
fn from(error: DbError) -> MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
MentatError::DbError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-08 18:56:27 +00:00
|
|
|
impl From<AlgebrizerError> for MentatError {
|
|
|
|
fn from(error: AlgebrizerError) -> MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
MentatError::AlgebrizerError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-08 19:37:25 +00:00
|
|
|
impl From<ProjectorError> for MentatError {
|
|
|
|
fn from(error: ProjectorError) -> MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
MentatError::ProjectorError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-08 18:01:09 +00:00
|
|
|
impl From<PullError> for MentatError {
|
|
|
|
fn from(error: PullError) -> MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
MentatError::PullError(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-08 20:19:08 +00:00
|
|
|
impl From<SQLError> for MentatError {
|
|
|
|
fn from(error: SQLError) -> MentatError {
|
2018-06-27 20:19:40 +00:00
|
|
|
MentatError::SQLError(error)
|
|
|
|
}
|
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
|
|
|
}
|
2018-06-29 04:47:19 +00:00
|
|
|
|
2018-07-11 23:26:06 +00:00
|
|
|
#[cfg(feature = "syncable")]
|
2018-08-08 21:33:53 +00:00
|
|
|
impl From<TolstoyError> for MentatError {
|
|
|
|
fn from(error: TolstoyError) -> MentatError {
|
2018-06-29 04:47:19 +00:00
|
|
|
MentatError::TolstoyError(error)
|
|
|
|
}
|
|
|
|
}
|