Fix query routes update

eclipse-zenoh · Jan 11, 2024 · 567feb9 · 567feb9
1 parent 7cdfc44
commit 567feb9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/zenoh/src/net/routing/dispatcher/queries.rs b/zenoh/src/net/routing/dispatcher/queries.rs
@@ -96,11 +96,11 @@ pub(crate) fn update_query_routes(tables: &Tables, res: &Arc<Resource>) {
     }
 }
 
-pub(crate) fn compute_query_routes_from(tables: &mut Tables, res: &mut Arc<Resource>) {
-    compute_query_routes(tables, res);
+pub(crate) fn update_query_routes_from(tables: &mut Tables, res: &mut Arc<Resource>) {
+    update_query_routes(tables, res);
     let res = get_mut_unchecked(res);
     for child in res.childs.values_mut() {
-        compute_query_routes_from(tables, child);
+        update_query_routes_from(tables, child);
     }
 }
 

diff --git a/zenoh/src/net/routing/dispatcher/resource.rs b/zenoh/src/net/routing/dispatcher/resource.rs
@@ -693,7 +693,7 @@ pub fn register_expr(
                 get_mut_unchecked(face)
                     .remote_mappings
                     .insert(expr_id, res.clone());
-                wtables.compute_matches_routes(&mut res);
+                wtables.update_matches_routes(&mut res);
                 drop(wtables);
             }
         },

diff --git a/zenoh/src/net/routing/dispatcher/tables.rs b/zenoh/src/net/routing/dispatcher/tables.rs
@@ -145,20 +145,20 @@ impl Tables {
         self.faces.values().find(|face| face.zid == *zid)
     }
 
-    fn compute_routes(&mut self, res: &mut Arc<Resource>) {
+    fn update_routes(&mut self, res: &mut Arc<Resource>) {
         update_data_routes(self, res);
-        compute_query_routes(self, res);
+        update_query_routes(self, res);
     }
 
-    pub(crate) fn compute_matches_routes(&mut self, res: &mut Arc<Resource>) {
+    pub(crate) fn update_matches_routes(&mut self, res: &mut Arc<Resource>) {
         if res.context.is_some() {
-            self.compute_routes(res);
+            self.update_routes(res);
 
             let resclone = res.clone();
             for match_ in &mut get_mut_unchecked(res).context_mut().matches {
                 let match_ = &mut match_.upgrade().unwrap();
                 if !Arc::ptr_eq(match_, &resclone) && match_.context.is_some() {
-                    self.compute_routes(match_);
+                    self.update_routes(match_);
                 }
             }
         }

diff --git a/zenoh/src/net/routing/hat/linkstate_peer/queries.rs b/zenoh/src/net/routing/hat/linkstate_peer/queries.rs
@@ -726,7 +726,7 @@ pub(super) fn queries_tree_change(tables: &mut Tables, new_childs: &[Vec<NodeInd
     }
 
     // recompute routes
-    compute_query_routes_from(tables, &mut tables.root_res.clone());
+    update_query_routes_from(tables, &mut tables.root_res.clone());
 }
 
 #[inline]

diff --git a/zenoh/src/net/routing/hat/router/queries.rs b/zenoh/src/net/routing/hat/router/queries.rs
@@ -1179,7 +1179,7 @@ pub(super) fn queries_tree_change(
     }
 
     // recompute routes
-    compute_query_routes_from(tables, &mut tables.root_res.clone());
+    update_query_routes_from(tables, &mut tables.root_res.clone());
 }
 
 #[inline]