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

Pre: Intern lookup_ref by reference.

Browse source
This commit is contained in:
Nick Alexander 2017-06-05 20:31:39 -07:00
parent a4fc04ea86
commit 2650fe163d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
db/src/tx.rs
View file

@ -194,7 +194,7 @@ impl<'conn, 'a> Tx<'conn, 'a> {
let mut temp_ids: intern_set::InternSet<TempId> = intern_set::InternSet::new(); let mut temp_ids: intern_set::InternSet<TempId> = intern_set::InternSet::new();
let mut lookup_refs: intern_set::InternSet<AVPair> = intern_set::InternSet::new(); let mut lookup_refs: intern_set::InternSet<AVPair> = intern_set::InternSet::new();
let intern_lookup_ref = |lookup_refs: &mut intern_set::InternSet<AVPair>, lookup_ref: entmod::LookupRef| -> Result<LookupRef> { let intern_lookup_ref = |lookup_refs: &mut intern_set::InternSet<AVPair>, lookup_ref: &entmod::LookupRef| -> Result<LookupRef> {
let lr_a: i64 = match lookup_ref.a { let lr_a: i64 = match lookup_ref.a {
entmod::Entid::Entid(ref a) => *a, entmod::Entid::Entid(ref a) => *a,
entmod::Entid::Ident(ref a) => self.schema.require_entid(&a)?, entmod::Entid::Ident(ref a) => self.schema.require_entid(&a)?,
@ -265,7 +265,7 @@ impl<'conn, 'a> Tx<'conn, 'a> {
} }
}, },
entmod::AtomOrLookupRefOrVectorOrMapNotation::LookupRef(lookup_ref) => { entmod::AtomOrLookupRefOrVectorOrMapNotation::LookupRef(ref lookup_ref) => {
if attribute.value_type != ValueType::Ref { if attribute.value_type != ValueType::Ref {
bail!(ErrorKind::NotYetImplemented(format!("Cannot resolve value lookup ref for attribute {} that is not :db/valueType :db.type/ref", a))) bail!(ErrorKind::NotYetImplemented(format!("Cannot resolve value lookup ref for attribute {} that is not :db/valueType :db.type/ref", a)))
} }
@ -360,7 +360,7 @@ impl<'conn, 'a> Tx<'conn, 'a> {
Either::Right(LookupRefOrTempId::TempId(temp_ids.intern(e))) Either::Right(LookupRefOrTempId::TempId(temp_ids.intern(e)))
}, },
entmod::EntidOrLookupRefOrTempId::LookupRef(lookup_ref) => { entmod::EntidOrLookupRefOrTempId::LookupRef(ref lookup_ref) => {
Either::Right(LookupRefOrTempId::LookupRef(intern_lookup_ref(&mut lookup_refs, lookup_ref)?)) Either::Right(LookupRefOrTempId::LookupRef(intern_lookup_ref(&mut lookup_refs, lookup_ref)?))
}, },
} }
@ -380,7 +380,7 @@ impl<'conn, 'a> Tx<'conn, 'a> {
Either::Right(LookupRefOrTempId::TempId(temp_ids.intern(e))) Either::Right(LookupRefOrTempId::TempId(temp_ids.intern(e)))
}, },
entmod::EntidOrLookupRefOrTempId::LookupRef(lookup_ref) => { entmod::EntidOrLookupRefOrTempId::LookupRef(ref lookup_ref) => {
Either::Right(LookupRefOrTempId::LookupRef(intern_lookup_ref(&mut lookup_refs, lookup_ref)?)) Either::Right(LookupRefOrTempId::LookupRef(intern_lookup_ref(&mut lookup_refs, lookup_ref)?))
}, },
}; };
@ -395,7 +395,7 @@ impl<'conn, 'a> Tx<'conn, 'a> {
/// Pipeline stage 2: rewrite `Term` instances with lookup refs into `Term` instances without /// Pipeline stage 2: rewrite `Term` instances with lookup refs into `Term` instances without
/// lookup refs. /// lookup refs.
/// ///
/// The `Term` instances produce share interned TempId handles and have no LookupRef references. /// The `Term` instances produced share interned TempId handles and have no LookupRef references.
fn resolve_lookup_refs<I>(&self, lookup_ref_map: &AVMap, terms: I) -> Result<Vec<TermWithTempIds>> where I: IntoIterator<Item=TermWithTempIdsAndLookupRefs> { fn resolve_lookup_refs<I>(&self, lookup_ref_map: &AVMap, terms: I) -> Result<Vec<TermWithTempIds>> where I: IntoIterator<Item=TermWithTempIdsAndLookupRefs> {
terms.into_iter().map(|term: TermWithTempIdsAndLookupRefs| -> Result<TermWithTempIds> { terms.into_iter().map(|term: TermWithTempIdsAndLookupRefs| -> Result<TermWithTempIds> {
match term { match term {