Merge branch 'auth_chain_non_recursive' into 'statediffs'

Auth chain non recursive

See merge request famedly/conduit!157

src/server_server.rs

@@ -1856,42 +1856,25 @@ fn get_auth_chain(
 ) -> Result<impl Iterator<Item = EventId> + '_> {
     let mut full_auth_chain = HashSet::new();
 
-    let starting_events = starting_events
+    let mut events = starting_events
         .iter()
         .map(|id| {
             db.rooms
                 .get_or_create_shorteventid(id, &db.globals)
-                .map(|s| (s, id))
+                .map(|s| (s, id.clone()))
         })
         .collect::<Result<Vec<_>>>()?;
 
     let mut cache = db.rooms.auth_chain_cache();
 
-    for (sevent_id, event_id) in starting_events {
+    while events.len() != 0 {
+        let mut new_events = Vec::new();
+        for (sevent_id, event_id) in &events {
             if let Some(cached) = cache.get_mut(&sevent_id) {
                 full_auth_chain.extend(cached.iter().cloned());
             } else {
                 drop(cache);
                 let mut auth_chain = HashSet::new();
-            get_auth_chain_recursive(&event_id, &mut auth_chain, db)?;
-            cache = db.rooms.auth_chain_cache();
-            cache.insert(sevent_id, auth_chain.clone());
-            full_auth_chain.extend(auth_chain);
-        };
-    }
-
-    drop(cache);
-
-    Ok(full_auth_chain
-        .into_iter()
-        .filter_map(move |sid| db.rooms.get_eventid_from_short(sid).ok()))
-}
-
-fn get_auth_chain_recursive(
-    event_id: &EventId,
-    found: &mut HashSet<u64>,
-    db: &Database,
-) -> Result<()> {
                 let r = db.rooms.get_pdu(&event_id);
                 match r {
                     Ok(Some(pdu)) => {
@@ -1899,9 +1882,9 @@ fn get_auth_chain_recursive(
                             let sauthevent = db
                                 .rooms
                                 .get_or_create_shorteventid(auth_event, &db.globals)?;
-                if !found.contains(&sauthevent) {
-                    found.insert(sauthevent);
-                    get_auth_chain_recursive(&auth_event, found, db)?;
+                            if !auth_chain.contains(&sauthevent) {
+                                auth_chain.insert(sauthevent);
+                                new_events.push((sauthevent, auth_event.clone()));
                             }
                         }
                     }
@@ -1912,8 +1895,19 @@ fn get_auth_chain_recursive(
                         warn!("Could not load event in auth chain: {}", e);
                     }
                 }
+                cache = db.rooms.auth_chain_cache();
+                cache.insert(*sevent_id, auth_chain.clone());
+                full_auth_chain.extend(auth_chain);
+            };
+        }
+        events = new_events;
+    }
 
-    Ok(())
+    drop(cache);
+
+    Ok(full_auth_chain
+        .into_iter()
+        .filter_map(move |sid| db.rooms.get_eventid_from_short(sid).ok()))
 }
 
 #[cfg_attr(