refactor(cognitarium): deduplicate bound var resolution

axone-protocol · Aug 22, 2024 · 9f389d4 · 9f389d4
1 parent e179988
commit 9f389d4
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 40 deletions.
diff --git a/contracts/axone-cognitarium/src/querier/expression.rs b/contracts/axone-cognitarium/src/querier/expression.rs
@@ -1,10 +1,11 @@
 use crate::msg;
 use crate::querier::mapper::iri_as_string;
+use crate::querier::variable::HasBoundVariables;
 use crate::querier::ResolvedVariables;
 use crate::state::NamespaceSolver;
 use cosmwasm_std::{StdError, StdResult};
 use std::cmp::Ordering;
-use std::collections::{BTreeSet, HashMap};
+use std::collections::HashMap;
 
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum Expression {
@@ -20,36 +21,6 @@ pub enum Expression {
 }
 
 impl Expression {
-    pub fn bound_variables(&self) -> BTreeSet<usize> {
-        let mut vars = BTreeSet::new();
-        self.lookup_bound_variables(&mut |v| {
-            vars.insert(v);
-        });
-        vars
-    }
-
-    pub fn lookup_bound_variables(&self, callback: &mut impl FnMut(usize)) {
-        match self {
-            Expression::Constant(_) => {}
-            Expression::Variable(v) => {
-                callback(*v);
-            }
-            Expression::And(exprs) | Expression::Or(exprs) => {
-                exprs
-                    .iter()
-                    .for_each(|e| e.lookup_bound_variables(callback));
-            }
-            Expression::Equal(left, right)
-            | Expression::Greater(left, right)
-            | Expression::GreaterOrEqual(left, right)
-            | Expression::Less(left, right)
-            | Expression::LessOrEqual(left, right) => {
-                left.lookup_bound_variables(callback);
-                right.lookup_bound_variables(callback);
-            }
-        }
-    }
-
     pub fn evaluate<'a>(
         &self,
         vars: &'a ResolvedVariables,
@@ -97,6 +68,30 @@ impl Expression {
     }
 }
 
+impl HasBoundVariables for Expression {
+    fn lookup_bound_variables(&self, callback: &mut impl FnMut(usize)) {
+        match self {
+            Expression::Constant(_) => {}
+            Expression::Variable(v) => {
+                callback(*v);
+            }
+            Expression::And(exprs) | Expression::Or(exprs) => {
+                exprs
+                    .iter()
+                    .for_each(|e| e.lookup_bound_variables(callback));
+            }
+            Expression::Equal(left, right)
+            | Expression::Greater(left, right)
+            | Expression::GreaterOrEqual(left, right)
+            | Expression::Less(left, right)
+            | Expression::LessOrEqual(left, right) => {
+                left.lookup_bound_variables(callback);
+                right.lookup_bound_variables(callback);
+            }
+        }
+    }
+}
+
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum Term {
     String(String),

diff --git a/contracts/axone-cognitarium/src/querier/plan.rs b/contracts/axone-cognitarium/src/querier/plan.rs
@@ -1,4 +1,5 @@
 use crate::querier::expression::Expression;
+use crate::querier::variable::HasBoundVariables;
 use crate::state::{Object, Predicate, Subject};
 use std::collections::BTreeSet;
 
@@ -90,16 +91,10 @@ impl QueryNode {
             bound_variables: Vec::new(),
         }
     }
+}
 
-    pub fn bound_variables(&self) -> BTreeSet<usize> {
-        let mut vars = BTreeSet::new();
-        self.lookup_bound_variables(&mut |v| {
-            vars.insert(v);
-        });
-        vars
-    }
-
-    pub fn lookup_bound_variables(&self, callback: &mut impl FnMut(usize)) {
+impl HasBoundVariables for QueryNode {
+    fn lookup_bound_variables(&self, callback: &mut impl FnMut(usize)) {
         match self {
             QueryNode::TriplePattern {
                 subject,

diff --git a/contracts/axone-cognitarium/src/querier/plan_builder.rs b/contracts/axone-cognitarium/src/querier/plan_builder.rs
@@ -3,6 +3,7 @@ use crate::msg::{Node, TriplePattern, VarOrNamedNode, VarOrNode, VarOrNodeOrLite
 use crate::querier::expression::{Expression, Term};
 use crate::querier::mapper::{iri_as_node, literal_as_object};
 use crate::querier::plan::{PatternValue, PlanVariable, QueryNode, QueryPlan};
+use crate::querier::variable::HasBoundVariables;
 use crate::state::{
     HasCachedNamespaces, Namespace, NamespaceQuerier, NamespaceResolver, Object, Predicate, Subject,
 };

diff --git a/contracts/axone-cognitarium/src/querier/variable.rs b/contracts/axone-cognitarium/src/querier/variable.rs
@@ -3,6 +3,7 @@ use crate::querier::expression::Term;
 use crate::state::{Literal, NamespaceSolver, Object, Predicate, Subject};
 use axone_rdf::normalize::IdentifierIssuer;
 use cosmwasm_std::StdResult;
+use std::collections::BTreeSet;
 
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum ResolvedVariable {
@@ -173,6 +174,18 @@ impl ResolvedVariables {
     }
 }
 
+pub trait HasBoundVariables {
+    fn bound_variables(&self) -> BTreeSet<usize> {
+        let mut vars = BTreeSet::new();
+        self.lookup_bound_variables(&mut |v| {
+            vars.insert(v);
+        });
+        vars
+    }
+
+    fn lookup_bound_variables(&self, callback: &mut impl FnMut(usize));
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;