seoul.systems / microcosm-rs
forked from microcosm.blue/microcosm-rs
Constellation, Spacedust, Slingshot, UFOs: atproto crates and services for microcosm
fork atom

Fix conflicts after rebasing on main

authored by seoul.systems and committed by tangled.org 62f7d7b4 af052ff3

+10 -6
+1 -1
constellation/src/server/mod.rs
··· 17 17 use tokio::task::spawn_blocking; 18 18 use tokio_util::sync::CancellationToken; 19 19 20 - use crate::storage::{LinkReader, StorageStats}; 20 + use crate::storage::{LinkReader, Order, StorageStats}; 21 21 use crate::{CountsByCount, Did, RecordId, RecordsBySubject}; 22 22 23 23 mod acceptable;
+8 -4
constellation/src/storage/mod.rs
··· 1856 1856 .unwrap(); 1857 1857 assert_eq!(b_group.subject, "b.com"); 1858 1858 assert_eq!(b_group.records.len(), 2); 1859 - assert!(b_group.records 1859 + assert!(b_group 1860 + .records 1860 1861 .iter() 1861 1862 .any(|r| r.did.0 == "did:plc:asdf" && r.rkey == "asdf")); 1862 - assert!(b_group.records 1863 + assert!(b_group 1864 + .records 1863 1865 .iter() 1864 1866 .any(|r| r.did.0 == "did:plc:asdf" && r.rkey == "asdf2")); 1865 1867 // Find c.com group ··· 1870 1872 .unwrap(); 1871 1873 assert_eq!(c_group.subject, "c.com"); 1872 1874 assert_eq!(c_group.records.len(), 2); 1873 - assert!(c_group.records 1875 + assert!(c_group 1876 + .records 1874 1877 .iter() 1875 1878 .any(|r| r.did.0 == "did:plc:fdsa" && r.rkey == "fdsa")); 1876 - assert!(c_group.records 1879 + assert!(c_group 1880 + .records 1877 1881 .iter() 1878 1882 .any(|r| r.did.0 == "did:plc:fdsa" && r.rkey == "fdsa2")); 1879 1883
+1 -1
constellation/src/storage/rocks_store.rs
··· 1142 1142 1143 1143 let Some(target_id) = self.target_id_table.get_id_val(&self.db, &target_key)? else { 1144 1144 eprintln!("Target not found for {target_key:?}"); 1145 - return Ok(Default::default()); 1145 + return Ok(PagedOrderedCollection::empty()); 1146 1146 }; 1147 1147 1148 1148 let filter_did_ids: HashMap<DidId, bool> = filter_dids