Compare commits
1 commit
master
...
rnewman/re
Author | SHA1 | Date | |
---|---|---|---|
![]() |
29ccbee911 |
3 changed files with 95 additions and 28 deletions
|
@ -499,7 +499,7 @@ fn read_ident_map(conn: &rusqlite::Connection) -> Result<IdentMap> {
|
||||||
fn read_attribute_map(conn: &rusqlite::Connection) -> Result<AttributeMap> {
|
fn read_attribute_map(conn: &rusqlite::Connection) -> Result<AttributeMap> {
|
||||||
let entid_triples = read_materialized_view(conn, "schema")?;
|
let entid_triples = read_materialized_view(conn, "schema")?;
|
||||||
let mut attribute_map = AttributeMap::default();
|
let mut attribute_map = AttributeMap::default();
|
||||||
metadata::update_attribute_map_from_entid_triples(&mut attribute_map, entid_triples)?;
|
metadata::update_attribute_map_from_entid_triples(&mut attribute_map, entid_triples, ::std::iter::empty())?;
|
||||||
Ok(attribute_map)
|
Ok(attribute_map)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1637,7 +1637,7 @@ mod tests {
|
||||||
// Cannot retract a characteristic of an installed attribute.
|
// Cannot retract a characteristic of an installed attribute.
|
||||||
assert_transact!(conn,
|
assert_transact!(conn,
|
||||||
"[[:db/retract 100 :db/cardinality :db.cardinality/many]]",
|
"[[:db/retract 100 :db/cardinality :db.cardinality/many]]",
|
||||||
Err("not yet implemented: Retracting metadata attribute assertions not yet implemented: retracted [e a] pairs [[100 8]]"));
|
Err("bad schema assertion: Retracting 8 for 100 not permitted."));
|
||||||
|
|
||||||
// Trying to install an attribute without a :db/ident is allowed.
|
// Trying to install an attribute without a :db/ident is allowed.
|
||||||
assert_transact!(conn, "[[:db/add 101 :db/valueType :db.type/long]
|
assert_transact!(conn, "[[:db/add 101 :db/valueType :db.type/long]
|
||||||
|
@ -1823,7 +1823,7 @@ mod tests {
|
||||||
|
|
||||||
assert_transact!(conn,
|
assert_transact!(conn,
|
||||||
"[[:db/retract 111 :db/fulltext true]]",
|
"[[:db/retract 111 :db/fulltext true]]",
|
||||||
Err("not yet implemented: Retracting metadata attribute assertions not yet implemented: retracted [e a] pairs [[111 12]]"));
|
Err("bad schema assertion: Retracting 12 for 111 not permitted."));
|
||||||
|
|
||||||
assert_transact!(conn,
|
assert_transact!(conn,
|
||||||
"[[:db/add 222 :db/fulltext true]]",
|
"[[:db/add 222 :db/fulltext true]]",
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
use std::collections::{BTreeMap, BTreeSet};
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
use std::collections::btree_map::Entry;
|
use std::collections::btree_map::Entry;
|
||||||
|
|
||||||
use itertools::Itertools; // For join().
|
|
||||||
|
|
||||||
use add_retract_alter_set::{
|
use add_retract_alter_set::{
|
||||||
AddRetractAlterSet,
|
AddRetractAlterSet,
|
||||||
};
|
};
|
||||||
|
@ -104,14 +102,66 @@ impl MetadataReport {
|
||||||
/// contain install and alter markers.
|
/// contain install and alter markers.
|
||||||
///
|
///
|
||||||
/// Returns a report summarizing the mutations that were applied.
|
/// Returns a report summarizing the mutations that were applied.
|
||||||
pub fn update_attribute_map_from_entid_triples<U>(attribute_map: &mut AttributeMap, assertions: U) -> Result<MetadataReport>
|
pub fn update_attribute_map_from_entid_triples<A, R>(attribute_map: &mut AttributeMap, assertions: A, retractions: R) -> Result<MetadataReport>
|
||||||
where U: IntoIterator<Item=(Entid, Entid, TypedValue)> {
|
where A: IntoIterator<Item=(Entid, Entid, TypedValue)>,
|
||||||
|
R: IntoIterator<Item=(Entid, Entid, TypedValue)> {
|
||||||
|
|
||||||
|
fn attribute_builder_to_modify(attribute_id: Entid, existing: &AttributeMap) -> AttributeBuilder {
|
||||||
|
existing.get(&attribute_id)
|
||||||
|
.map(AttributeBuilder::to_modify_attribute)
|
||||||
|
.unwrap_or_else(AttributeBuilder::default)
|
||||||
|
}
|
||||||
|
|
||||||
// Group mutations by impacted entid.
|
// Group mutations by impacted entid.
|
||||||
let mut builders: BTreeMap<Entid, AttributeBuilder> = BTreeMap::new();
|
let mut builders: BTreeMap<Entid, AttributeBuilder> = BTreeMap::new();
|
||||||
|
|
||||||
|
// For retractions, we start with an attribute builder that's pre-populated with the existing
|
||||||
|
// attribute values. That allows us to check existing values and unset them.
|
||||||
|
for (entid, attr, ref value) in retractions.into_iter() {
|
||||||
|
let builder = builders.entry(entid).or_insert_with(|| attribute_builder_to_modify(entid, attribute_map));
|
||||||
|
match attr {
|
||||||
|
// You can only retract :db/unique, :db/doc, :db/isComponent; all others
|
||||||
|
// must be altered instead of retracted, or are not allowed to change.
|
||||||
|
entids::DB_DOC => {
|
||||||
|
// Nothing to do here; we don't keep docstrings inside `Attribute`s.
|
||||||
|
},
|
||||||
|
entids::DB_IS_COMPONENT => {
|
||||||
|
match value {
|
||||||
|
&TypedValue::Boolean(v) if builder.component == Some(v) => {
|
||||||
|
builder.component(false);
|
||||||
|
},
|
||||||
|
v => {
|
||||||
|
bail!(ErrorKind::BadSchemaAssertion(format!("Attempted to retract :db/isComponent with the wrong value {:?}.", v)));
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
entids::DB_UNIQUE => {
|
||||||
|
match *value {
|
||||||
|
TypedValue::Ref(u) => {
|
||||||
|
match u {
|
||||||
|
entids::DB_UNIQUE_VALUE if builder.unique == Some(Some(attribute::Unique::Value)) => {
|
||||||
|
builder.non_unique();
|
||||||
|
},
|
||||||
|
entids::DB_UNIQUE_IDENTITY if builder.unique == Some(Some(attribute::Unique::Identity)) => {
|
||||||
|
builder.non_unique();
|
||||||
|
},
|
||||||
|
v => {
|
||||||
|
bail!(ErrorKind::BadSchemaAssertion(format!("Attempted to retract :db/unique with the wrong value {}.", v)));
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => bail!(ErrorKind::BadSchemaAssertion(format!("Expected [:db/retract _ :db/unique :db.unique/_] but got [:db/retract {} :db/unique {:?}]", entid, value)))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
bail!(ErrorKind::BadSchemaAssertion(format!("Retracting {} for {} not permitted.", attr, entid)));
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (entid, attr, ref value) in assertions.into_iter() {
|
for (entid, attr, ref value) in assertions.into_iter() {
|
||||||
let builder = builders.entry(entid).or_insert(AttributeBuilder::default());
|
// For assertions, we can start with an empty attribute builder.
|
||||||
|
let builder = builders.entry(entid).or_insert_with(Default::default);
|
||||||
|
|
||||||
// TODO: improve error messages throughout.
|
// TODO: improve error messages throughout.
|
||||||
match attr {
|
match attr {
|
||||||
|
@ -146,11 +196,6 @@ pub fn update_attribute_map_from_entid_triples<U>(attribute_map: &mut AttributeM
|
||||||
|
|
||||||
entids::DB_UNIQUE => {
|
entids::DB_UNIQUE => {
|
||||||
match *value {
|
match *value {
|
||||||
// TODO: accept nil in some form.
|
|
||||||
// TypedValue::Nil => {
|
|
||||||
// builder.unique_value(false);
|
|
||||||
// builder.unique_identity(false);
|
|
||||||
// },
|
|
||||||
TypedValue::Ref(entids::DB_UNIQUE_VALUE) => { builder.unique(attribute::Unique::Value); },
|
TypedValue::Ref(entids::DB_UNIQUE_VALUE) => { builder.unique(attribute::Unique::Value); },
|
||||||
TypedValue::Ref(entids::DB_UNIQUE_IDENTITY) => { builder.unique(attribute::Unique::Identity); },
|
TypedValue::Ref(entids::DB_UNIQUE_IDENTITY) => { builder.unique(attribute::Unique::Identity); },
|
||||||
_ => bail!(ErrorKind::BadSchemaAssertion(format!("Expected [... :db/unique :db.unique/value|:db.unique/identity] but got [... :db/unique {:?}]", value)))
|
_ => bail!(ErrorKind::BadSchemaAssertion(format!("Expected [... :db/unique :db.unique/value|:db.unique/identity] but got [... :db/unique {:?}]", value)))
|
||||||
|
@ -257,17 +302,14 @@ pub fn update_schema_from_entid_quadruples<U>(schema: &mut Schema, assertions: U
|
||||||
attribute_set.witness((e, a), typed_value, added);
|
attribute_set.witness((e, a), typed_value, added);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Datomic does not allow to retract attributes or idents. For now, Mentat follows suit.
|
|
||||||
if !attribute_set.retracted.is_empty() {
|
|
||||||
bail!(ErrorKind::NotYetImplemented(format!("Retracting metadata attribute assertions not yet implemented: retracted [e a] pairs [{}]",
|
|
||||||
attribute_set.retracted.keys().map(|&(e, a)| format!("[{} {}]", e, a)).join(", "))));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Collect triples.
|
// Collect triples.
|
||||||
|
let retracted_triples = attribute_set.retracted.into_iter().map(|((e, a), typed_value)| (e, a, typed_value));
|
||||||
let asserted_triples = attribute_set.asserted.into_iter().map(|((e, a), typed_value)| (e, a, typed_value));
|
let asserted_triples = attribute_set.asserted.into_iter().map(|((e, a), typed_value)| (e, a, typed_value));
|
||||||
let altered_triples = attribute_set.altered.into_iter().map(|((e, a), (_old_value, new_value))| (e, a, new_value));
|
let altered_triples = attribute_set.altered.into_iter().map(|((e, a), (_old_value, new_value))| (e, a, new_value));
|
||||||
|
|
||||||
let report = update_attribute_map_from_entid_triples(&mut schema.attribute_map, asserted_triples.chain(altered_triples))?;
|
let report = update_attribute_map_from_entid_triples(&mut schema.attribute_map,
|
||||||
|
asserted_triples.chain(altered_triples),
|
||||||
|
retracted_triples)?;
|
||||||
|
|
||||||
let mut idents_altered: BTreeMap<Entid, IdentAlteration> = BTreeMap::new();
|
let mut idents_altered: BTreeMap<Entid, IdentAlteration> = BTreeMap::new();
|
||||||
|
|
||||||
|
|
|
@ -73,13 +73,13 @@ fn validate_attribute_map(entid_map: &EntidMap, attribute_map: &AttributeMap) ->
|
||||||
#[derive(Clone,Debug,Default,Eq,Hash,Ord,PartialOrd,PartialEq)]
|
#[derive(Clone,Debug,Default,Eq,Hash,Ord,PartialOrd,PartialEq)]
|
||||||
pub struct AttributeBuilder {
|
pub struct AttributeBuilder {
|
||||||
helpful: bool,
|
helpful: bool,
|
||||||
value_type: Option<ValueType>,
|
pub value_type: Option<ValueType>,
|
||||||
multival: Option<bool>,
|
pub multival: Option<bool>,
|
||||||
unique: Option<Option<attribute::Unique>>,
|
pub unique: Option<Option<attribute::Unique>>,
|
||||||
index: Option<bool>,
|
pub index: Option<bool>,
|
||||||
fulltext: Option<bool>,
|
pub fulltext: Option<bool>,
|
||||||
component: Option<bool>,
|
pub component: Option<bool>,
|
||||||
no_history: Option<bool>,
|
pub no_history: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AttributeBuilder {
|
impl AttributeBuilder {
|
||||||
|
@ -92,6 +92,16 @@ impl AttributeBuilder {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Make a new AttributeBuilder from an existing Attribute. This is important to allow
|
||||||
|
/// retraction. Only attributes that we allow to change are duplicated here.
|
||||||
|
pub fn to_modify_attribute(attribute: &Attribute) -> Self {
|
||||||
|
let mut ab = AttributeBuilder::default();
|
||||||
|
ab.multival = Some(attribute.multival);
|
||||||
|
ab.unique = Some(attribute.unique);
|
||||||
|
ab.component = Some(attribute.component);
|
||||||
|
ab
|
||||||
|
}
|
||||||
|
|
||||||
pub fn value_type<'a>(&'a mut self, value_type: ValueType) -> &'a mut Self {
|
pub fn value_type<'a>(&'a mut self, value_type: ValueType) -> &'a mut Self {
|
||||||
self.value_type = Some(value_type);
|
self.value_type = Some(value_type);
|
||||||
self
|
self
|
||||||
|
@ -102,6 +112,11 @@ impl AttributeBuilder {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn non_unique<'a>(&'a mut self) -> &'a mut Self {
|
||||||
|
self.unique = Some(None);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
pub fn unique<'a>(&'a mut self, unique: attribute::Unique) -> &'a mut Self {
|
pub fn unique<'a>(&'a mut self, unique: attribute::Unique) -> &'a mut Self {
|
||||||
if self.helpful && unique == attribute::Unique::Identity {
|
if self.helpful && unique == attribute::Unique::Identity {
|
||||||
self.index = Some(true);
|
self.index = Some(true);
|
||||||
|
@ -185,12 +200,19 @@ impl AttributeBuilder {
|
||||||
mutations.push(AttributeAlteration::Cardinality);
|
mutations.push(AttributeAlteration::Cardinality);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(ref unique) = self.unique {
|
if let Some(ref unique) = self.unique {
|
||||||
if *unique != attribute.unique {
|
if *unique != attribute.unique {
|
||||||
attribute.unique = unique.clone();
|
attribute.unique = unique.clone();
|
||||||
mutations.push(AttributeAlteration::Unique);
|
mutations.push(AttributeAlteration::Unique);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if attribute.unique != None {
|
||||||
|
attribute.unique = None;
|
||||||
|
mutations.push(AttributeAlteration::Unique);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(index) = self.index {
|
if let Some(index) = self.index {
|
||||||
if index != attribute.index {
|
if index != attribute.index {
|
||||||
attribute.index = index;
|
attribute.index = index;
|
||||||
|
@ -255,7 +277,10 @@ impl SchemaBuilding for Schema {
|
||||||
}).collect();
|
}).collect();
|
||||||
|
|
||||||
let mut schema = Schema::from_ident_map_and_attribute_map(ident_map, AttributeMap::default())?;
|
let mut schema = Schema::from_ident_map_and_attribute_map(ident_map, AttributeMap::default())?;
|
||||||
let metadata_report = metadata::update_attribute_map_from_entid_triples(&mut schema.attribute_map, entid_assertions?)?;
|
let metadata_report = metadata::update_attribute_map_from_entid_triples(&mut schema.attribute_map,
|
||||||
|
entid_assertions?,
|
||||||
|
// No retractions.
|
||||||
|
::std::iter::empty())?;
|
||||||
|
|
||||||
// Rebuild the component attributes list if necessary.
|
// Rebuild the component attributes list if necessary.
|
||||||
if metadata_report.attributes_did_change() {
|
if metadata_report.attributes_did_change() {
|
||||||
|
|
Loading…
Reference in a new issue