greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Review comment: take the last seen txInstant and transact it once.

Browse source
This commit is contained in:
Richard Newman 2018-01-22 13:16:01 -08:00
parent 68b4d51e1b
commit 96dbf26d38
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
db/src/tx.rs
View file

@ -615,28 +615,34 @@ impl<'conn, 'a> Tx<'conn, 'a> {
// Pipeline stage 4: final terms (after rewriting) -> DB insertions. // Pipeline stage 4: final terms (after rewriting) -> DB insertions.
// Collect into non_fts_*. // Collect into non_fts_*.
// TODO: use something like Clojure's group_by to do this. // TODO: use something like Clojure's group_by to do this.
let mut tx_instant_set = false;
for term in final_terms { for term in final_terms {
match term { match term {
Term::AddOrRetract(op, e, a, v) => { Term::AddOrRetract(op, KnownEntid(e), a, v) => {
let attribute: &Attribute = self.schema.require_attribute_for_entid(a)?; let attribute: &Attribute = self.schema.require_attribute_for_entid(a)?;
if entids::might_update_metadata(a) { if entids::might_update_metadata(a) {
tx_might_update_metadata = true; tx_might_update_metadata = true;
} }
if e == KnownEntid(self.tx_id) && a == entids::DB_TX_INSTANT { let added = op == OpType::Add;
tx_instant_set = true;
// We take the last encountered :db/txInstant value.
if added &&
e == self.tx_id &&
a == entids::DB_TX_INSTANT {
if let TypedValue::Instant(instant) = v { if let TypedValue::Instant(instant) = v {
// TODO: `instant` should be strictly after the last transaction
// timestamp and strictly before the current transactor timestamp.
self.tx_instant = instant; self.tx_instant = instant;
} else { } else {
panic!("This type error should have been caught earlier."); panic!("This type error should have been caught earlier.");
} }
// TODO: INSTANT to be strictly after the last transaction
// timestamp and strictly before the current transactor timestamp. // We don't need to add the datom here: we'll do so for the current
// timestamp at the end of the loop.
continue;
} }
let added = op == OpType::Add; let reduced = (e, a, attribute, v, added);
let reduced = (e.0, a, attribute, v, added);
match (attribute.fulltext, attribute.multival) { match (attribute.fulltext, attribute.multival) {
(false, true) => non_fts_many.push(reduced), (false, true) => non_fts_many.push(reduced),
(false, false) => non_fts_one.push(reduced), (false, false) => non_fts_one.push(reduced),
@ -648,13 +654,11 @@ impl<'conn, 'a> Tx<'conn, 'a> {
} }
// Transact [:db/add :db/txInstant NOW :db/tx] if it doesn't exist. // Transact [:db/add :db/txInstant NOW :db/tx] if it doesn't exist.
if !tx_instant_set { non_fts_one.push((self.tx_id,
non_fts_one.push((self.tx_id, entids::DB_TX_INSTANT,
entids::DB_TX_INSTANT, self.schema.require_attribute_for_entid(entids::DB_TX_INSTANT).unwrap(),
self.schema.require_attribute_for_entid(entids::DB_TX_INSTANT).unwrap(), TypedValue::Instant(self.tx_instant),
TypedValue::Instant(self.tx_instant), true));
true));
}
if !non_fts_one.is_empty() { if !non_fts_one.is_empty() {
self.store.insert_non_fts_searches(&non_fts_one[..], db::SearchType::Inexact)?; self.store.insert_non_fts_searches(&non_fts_one[..], db::SearchType::Inexact)?;