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

Tighter tx check; comments; failing test in CI

Browse source
This commit is contained in:
Grisha Kruglov 2018-02-01 19:16:46 -05:00
parent 8ae1ddf03e
commit 0d5e39a26d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/tolstoy.rs
View file

@ -31,9 +31,9 @@ fn test_reader() {
let txes = TxClient::all(&c).expect("bootstrap transactions");
// Don't inspect the bootstrap, but we'd like to see it's there.
// Don't inspect the bootstrap transaction, but we'd like to see it's there.
assert_eq!(1, txes.len());
assert_eq!(76, txes[0].parts.len());
assert_eq!(94, txes[0].parts.len());
let ids = conn.transact(&mut c, r#"[
[:db/add "s" :db/ident :foo/numba]

6
tolstoy/src/tx_client.rs
View file

@ -96,7 +96,7 @@ impl TxReader for TxClient {
let datom = datom_result?;
// Datom represents a transaction.
if datom.a == entids::DB_TX_INSTANT {
if datom.a == entids::DB_TX_INSTANT && datom.tx == datom.e {
// Does the Tx already exist in the map? That means we've inserted it
// with an incomplete tx_instant; update it.
if let Entry::Occupied(mut tx) = txes_by_tx.entry(datom.tx) {
@ -111,14 +111,14 @@ impl TxReader for TxClient {
});
// Datom represents a transaction part.
} else {
// Does the Tx for this part already exist in the map?
// Append this part to the parts list.
let part = TxPart {
e: datom.e,
a: datom.a,
v: datom.v,
added: datom.added,
};
// Does the Tx for this part already exist in the map?
// Append this part to the parts list.
if let Entry::Occupied(mut tx) = txes_by_tx.entry(datom.tx) {
tx.get_mut().parts.push(part);
continue;