diff --git a/cozo-core/src/query/compile.rs b/cozo-core/src/query/compile.rs index f7971cff..3efb7d99 100644 --- a/cozo-core/src/query/compile.rs +++ b/cozo-core/src/query/compile.rs @@ -21,7 +21,7 @@ use crate::data::program::{ use crate::data::symb::Symbol; use crate::data::value::DataValue; use crate::parse::SourceSpan; -use crate::query::relation::RelAlgebra; +use crate::query::ra::RelAlgebra; use crate::runtime::in_mem::InMemRelation; use crate::runtime::relation::{AccessLevel, InsufficientAccessLevel}; use crate::runtime::transact::SessionTx; diff --git a/cozo-core/src/query/eval.rs b/cozo-core/src/query/eval.rs index 2063d26c..706156e3 100644 --- a/cozo-core/src/query/eval.rs +++ b/cozo-core/src/query/eval.rs @@ -15,7 +15,7 @@ use log::{debug, trace}; use miette::Result; use crate::data::aggr::Aggregation; -use crate::data::program::{MagicAlgoApply, MagicSymbol, NoEntryError}; +use crate::data::program::{MagicSymbol, NoEntryError}; use crate::data::symb::{Symbol, PROG_ENTRY}; use crate::data::tuple::Tuple; use crate::data::value::DataValue; @@ -132,7 +132,9 @@ impl<'a> SessionTx<'a> { } }, CompiledRuleSet::Algo(algo_apply) => { - self.algo_application_eval(k, algo_apply, stores, poison.clone())?; + let mut algo_impl = algo_apply.algo.get_impl()?; + let out = stores.get(k).unwrap(); + algo_impl.run(self, algo_apply, stores, out, poison.clone())?; } } } @@ -191,17 +193,6 @@ impl<'a> SessionTx<'a> { } Ok(used_limiter) } - fn algo_application_eval( - &self, - rule_symb: &MagicSymbol, - algo_apply: &MagicAlgoApply, - stores: &BTreeMap, - poison: Poison, - ) -> Result<()> { - let mut algo_impl = algo_apply.algo.get_impl()?; - let out = stores.get(rule_symb).unwrap(); - algo_impl.run(self, algo_apply, stores, out, poison) - } /// returns true is early return is activated fn initial_rule_normal_eval( &self, diff --git a/cozo-core/src/query/mod.rs b/cozo-core/src/query/mod.rs index f63afa5b..212b4fe6 100644 --- a/cozo-core/src/query/mod.rs +++ b/cozo-core/src/query/mod.rs @@ -12,7 +12,7 @@ pub(crate) mod graph; pub(crate) mod logical; pub(crate) mod magic; pub(crate) mod stored; -pub(crate) mod relation; +pub(crate) mod ra; pub(crate) mod reorder; pub(crate) mod stratify; pub(crate) mod sort; \ No newline at end of file diff --git a/cozo-core/src/query/relation.rs b/cozo-core/src/query/ra.rs similarity index 100% rename from cozo-core/src/query/relation.rs rename to cozo-core/src/query/ra.rs diff --git a/cozo-core/src/runtime/db.rs b/cozo-core/src/runtime/db.rs index a929dc50..3823e895 100644 --- a/cozo-core/src/runtime/db.rs +++ b/cozo-core/src/runtime/db.rs @@ -30,7 +30,7 @@ use crate::decode_tuple_from_kv; use crate::parse::sys::SysOp; use crate::parse::{parse_script, CozoScript, SourceSpan}; use crate::query::compile::{CompiledProgram, CompiledRule, CompiledRuleSet}; -use crate::query::relation::{ +use crate::query::ra::{ FilteredRA, InMemRelationRA, InnerJoin, NegJoin, RelAlgebra, ReorderRA, StoredRA, UnificationRA, }; use crate::runtime::relation::{AccessLevel, InsufficientAccessLevel, RelationHandle, RelationId};