MoreThanText/morethantext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed document id from message.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-18 10:09:55 -05:00
parent c3748ab845
commit bcddc1047a
6 changed files with 82 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/document/clock.rs
View File

@@ -26,17 +26,11 @@ impl Clock {
vec![Name::english("clock")]
}
/*
fn get_name() -> Name {
Name::english("clock")
}
*/
fn gen_message() -> Message {
Message::new(
Clock::doc_names()[0].clone(),
MsgAction::OnUpdate(Records::new(Clock::doc_names(), Names::new())),
)
Message::new(MsgAction::OnUpdate(Records::new(
Clock::doc_names(),
Names::new(),
)))
}
pub fn get_path() -> Path {
@@ -52,7 +46,7 @@ impl Clock {
let (tx, rx) = channel();
let id = queue.add_sender(tx);
let reg_msg = Register::new(id, RegMsg::AddDocName(Clock::doc_names()));
let msg = Message::new(NameType::None, reg_msg.clone());
let msg = Message::new(reg_msg.clone());
queue.send(msg);
rx.recv().unwrap();
spawn(move || {
@@ -94,7 +88,7 @@ mod clocks {
id.clone(),
RegMsg::AddRoute(Path::new(Include::All, Include::All, Include::All)),
);
queue.send(Message::new(NameType::None, request));
queue.send(Message::new(request));
rx.recv_timeout(TIMEOUT).unwrap();
let mut holder: Vec<Message> = Vec::new();
let start = Utc::now();
@@ -106,7 +100,7 @@ mod clocks {
assert!((end - start) > TimeDelta::seconds(1));
assert!((end - start) < TimeDelta::seconds(2));
let reg_request = Register::new(id, RegMsg::GetNameID(Clock::doc_names()[0].clone()));
queue.send(Message::new(NameType::None, reg_request));
queue.send(Message::new(reg_request));
rx.recv_timeout(TIMEOUT).unwrap();
for msg in holder.iter() {
let action = msg.get_action();

105
src/document/create.rs
View File

@@ -44,7 +44,7 @@ impl CreateDoc {
let id = queue.add_sender(tx);
for route in routes.iter() {
let regmsg = Register::new(id.clone(), RegMsg::AddRoute(route.clone()));
queue.send(Message::new(NameType::None, regmsg));
queue.send(Message::new(regmsg));
rx.recv().unwrap();
}
let doc = CreateDoc::new(queue, rx);
@@ -96,7 +96,7 @@ mod createdocs {
fn register_paths(&self, paths: Vec<Path>) {
for path in paths.iter() {
let regmsg = Register::new(self.rx_id.clone(), RegMsg::AddRoute(path.clone()));
self.queue.send(Message::new(NameType::None, regmsg));
self.queue.send(Message::new(regmsg));
self.rx.recv_timeout(TIMEOUT).unwrap();
}
}
@@ -114,7 +114,7 @@ mod createdocs {
let queue = doc_creator.get_queue();
let rx = doc_creator.get_receiver();
let name = Name::english("project");
let msg1 = Message::new(NameType::None, MsgAction::Create(DocDef::new(name.clone())));
let msg1 = Message::new(MsgAction::Create(DocDef::new(name.clone())));
queue.send(msg1.clone());
let result1 = rx.recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -127,7 +127,7 @@ mod createdocs {
MsgAction::Reply(_) => {}
_ => unreachable!("got {:?}: should have been a reply.", result1.get_action()),
}
let msg2 = Message::new(name.clone(), Query::new(name.clone()));
let msg2 = Message::new(Query::new(name.clone()));
queue.send(msg2.clone());
let result2 = rx.recv_timeout(TIMEOUT).unwrap();
assert_eq!(result2.get_message_id(), msg2.get_message_id());
@@ -150,8 +150,8 @@ mod createdocs {
let queue = doc_creator.get_queue();
let rx = doc_creator.get_receiver();
let name = Name::english("duplicate");
let msg1 = Message::new(NameType::None, MsgAction::Create(DocDef::new(name.clone())));
let msg2 = Message::new(NameType::None, MsgAction::Create(DocDef::new(name.clone())));
let msg1 = Message::new(MsgAction::Create(DocDef::new(name.clone())));
let msg2 = Message::new(MsgAction::Create(DocDef::new(name.clone())));
queue.send(msg1.clone());
queue.send(msg2.clone());
let result = rx.recv_timeout(TIMEOUT).unwrap();
@@ -920,20 +920,17 @@ mod document_files {
where
A: Into<MsgAction>,
{
let msg = Message::new(self.docdef.get_document_names()[0].clone(), action);
let msg = Message::new(action);
self.queue.send(msg);
}
fn start(&mut self, routes: Vec<Path>) {
let msg = Message::new(
self.docdef.get_document_names()[0].clone(),
self.docdef.clone(),
);
let msg = Message::new(self.docdef.clone());
DocumentFile::start(self.queue.clone(), msg);
for route in routes.iter() {
let request =
Register::new(self.sender_id.clone(), RegMsg::AddRoute(route.clone()));
let add_route = Message::new(NameType::None, request);
let add_route = Message::new(request);
self.queue.send(add_route);
self.rx.recv().unwrap();
}
@@ -982,7 +979,7 @@ mod document_files {
let alt = Name::english("alternate");
test_doc.start(standard_paths());
let docdef = DocDef::new(alt);
let msg = Message::new(name.clone(), docdef);
let msg = Message::new(docdef);
test_doc.get_queue().send(msg);
match test_doc.get_receiver().recv_timeout(TIMEOUT) {
Ok(msg) => unreachable!("should not receive: {:?}", msg),
@@ -1008,7 +1005,7 @@ mod document_files {
MsgAction::Update(Update::new(name.clone())),
];
for msg_action in msg_actions.iter() {
let msg = Message::new(name.clone(), msg_action.clone());
let msg = Message::new(msg_action.clone());
queue.send(msg.clone());
let result = match test_doc.get_receiver().recv_timeout(TIMEOUT) {
Ok(data) => data.clone(),
@@ -1048,7 +1045,7 @@ mod document_files {
test_doc.get_sender_id(),
RegMsg::AddDocName([alt.clone()].to_vec()),
);
let setup = Message::new(NameType::None, reg_msg.clone());
let setup = Message::new(reg_msg.clone());
queue.send(setup);
test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let msg_actions = [
@@ -1061,7 +1058,7 @@ mod document_files {
];
let mut msgs: HashMap<Uuid, MsgAction> = HashMap::new();
for msg_action in msg_actions.iter() {
let msg = Message::new(alt.clone(), msg_action.clone());
let msg = Message::new(msg_action.clone());
msgs.insert(msg.get_message_id().clone(), msg_action.clone());
queue.send(msg);
}
@@ -1099,7 +1096,7 @@ mod document_files {
for item in data.iter() {
test_doc.populate([item.clone()].to_vec());
}
let msg = Message::new(doc_name.clone(), Query::new(doc_name.clone()));
let msg = Message::new(Query::new(doc_name.clone()));
queue.send(msg.clone());
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -1138,7 +1135,7 @@ mod document_files {
test_doc.start(routes);
let mut add = Addition::new(doc_name.clone());
add.add_field(field_name.clone(), data.clone());
let msg = Message::new(doc_name.clone(), add);
let msg = Message::new(add);
queue.send(msg.clone());
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -1178,7 +1175,7 @@ mod document_files {
for item in data.iter() {
test_doc.populate([item.clone()].to_vec());
}
let msg = Message::new(doc_name.clone(), Delete::new(doc_name.clone()));
let msg = Message::new(Delete::new(doc_name.clone()));
queue.send(msg.clone());
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -1228,7 +1225,7 @@ mod document_files {
update
.get_values_mut()
.add_field(field_name.clone(), Uuid::nil());
let msg = Message::new(doc_name.clone(), update);
let msg = Message::new(update);
queue.send(msg.clone());
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -1285,8 +1282,8 @@ mod document_files {
),
}
};
testing(Message::new(doc_name.clone(), new_doc));
testing(Message::new(doc_name.clone(), Query::new(doc_name.clone())));
testing(Message::new(new_doc));
testing(Message::new(Query::new(doc_name.clone())));
}
#[test]
@@ -1302,10 +1299,10 @@ mod document_files {
for i in 0..count {
let mut new_doc = Addition::new(doc_name.clone());
new_doc.add_field(name.clone(), i);
queue.send(Message::new(doc_name.clone(), new_doc));
queue.send(Message::new(new_doc));
test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
}
queue.send(Message::new(doc_name.clone(), Query::new(doc_name.clone())));
queue.send(Message::new(Query::new(doc_name.clone())));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
let mut entries: HashSet<i128> = (0..count).collect();
@@ -1345,10 +1342,7 @@ mod document_files {
let name = Name::english("bad");
let mut addition = Addition::new(test_doc.doc_name());
addition.add_field(name.clone(), "doesn't matter");
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
addition,
));
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
@@ -1366,10 +1360,7 @@ mod document_files {
let queue = test_doc.get_queue();
let mut addition = Addition::new(test_doc.doc_name());
addition.add_field(Name::english("field0"), "string");
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
addition,
));
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
@@ -1390,10 +1381,7 @@ mod document_files {
let queue = test_doc.get_queue();
let mut addition = Addition::new(test_doc.doc_name());
addition.add_field(Name::english("field0"), 1);
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
addition,
));
queue.send(Message::new(addition));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
match result.get_action() {
MsgAction::Error(err) => match err.error_id() {
@@ -1421,10 +1409,7 @@ mod document_files {
.unwrap();
let mut query = Query::new(doc_name);
query.add(Name::english("field0"), calc);
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
query,
));
queue.send(Message::new(query));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -1458,10 +1443,7 @@ mod document_files {
calc.add_value(1).unwrap();
let mut query = Query::new(doc_name);
query.add(Name::english("field0"), calc);
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
query,
));
queue.send(Message::new(query));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -1499,10 +1481,7 @@ mod document_files {
.unwrap();
let mut query = Query::new(doc_name);
query.add(Name::english("field0"), calc);
queue.send(Message::new(
test_doc.get_docdef().get_document_names()[0].clone(),
query,
));
queue.send(Message::new(query));
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -1671,7 +1650,7 @@ mod document_files {
let mut calc = Calculation::new(Operand::Equal);
calc.add_value("something").unwrap();
query.add(field_name.clone(), calc);
let msg = Message::new(doc_name, query);
let msg = Message::new(query);
queue.send(msg);
let result = rx.recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -1722,7 +1701,7 @@ mod document_files {
let queue = test_doc.get_queue();
let rx = test_doc.get_receiver();
let new_doc = Addition::new(doc_name.clone());
let msg = Message::new(doc_name, new_doc);
let msg = Message::new(new_doc);
queue.send(msg);
let result = rx.recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -1750,7 +1729,7 @@ mod document_files {
let queue = test_doc.get_queue();
let rx = test_doc.get_receiver();
let new_doc = Addition::new(doc_name.clone());
let msg = Message::new(doc_name, new_doc);
let msg = Message::new(new_doc);
queue.send(msg);
let result = rx.recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -1779,7 +1758,7 @@ mod document_files {
let rx = test_doc.get_receiver();
let mut new_doc = Addition::new(doc_name.clone());
new_doc.add_field(&field_name, Uuid::nil());
let msg = Message::new(doc_name, new_doc);
let msg = Message::new(new_doc);
queue.send(msg);
let result = rx.recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -1863,8 +1842,8 @@ mod document_files {
_ => unreachable!("got {:?}: should have gotten a reply", action),
}
};
testing(Message::new(doc_name.clone(), update));
testing(Message::new(doc_name.clone(), Query::new(doc_name.clone())));
testing(Message::new(update));
testing(Message::new(Query::new(doc_name.clone())));
}
#[test]
@@ -1890,7 +1869,7 @@ mod document_files {
update
.get_values_mut()
.add_field(Name::english("field1"), new);
doc.get_queue().send(Message::new(doc_name.clone(), update));
doc.get_queue().send(Message::new(update));
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -1904,7 +1883,7 @@ mod document_files {
_ => unreachable!("got {:?}: should have gotten a reply", action),
}
doc.get_queue()
.send(Message::new(doc_name.clone(), Query::new(doc_name.clone())));
.send(Message::new(Query::new(doc_name.clone())));
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -1969,8 +1948,8 @@ mod document_files {
_ => unreachable!("got {:?}: should have gotten a reply", action),
}
};
testing(Message::new(doc_name.clone(), update));
testing(Message::new(doc_name.clone(), Query::new(doc_name.clone())));
testing(Message::new(update));
testing(Message::new(Query::new(doc_name.clone())));
}
#[test]
@@ -2428,13 +2407,13 @@ mod document_files {
for item in 1..3 {
doc.populate([item.into()].to_vec());
}
let trigger = Message::new(
Name::english("clock"),
MsgAction::OnUpdate(Records::new(Clock::doc_names(), Names::new())),
);
let trigger = Message::new(MsgAction::OnUpdate(Records::new(
Clock::doc_names(),
Names::new(),
)));
queue.send(trigger.clone());
sleep(TIMEOUT);
let msg = Message::new(doc_name.clone(), Query::new(doc_name.clone()));
let msg = Message::new(Query::new(doc_name.clone()));
queue.send(msg.clone());
let mut result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
while result.get_message_id() != msg.get_message_id() {

8
src/document/session.rs
View File

@@ -65,7 +65,7 @@ impl Session {
let (tx, rx) = channel();
let sender_id = queue.add_sender(tx);
let msg = Message::new(NameType::None, docdef);
let msg = Message::new(docdef);
let msg_id = msg.get_message_id().clone();
let path = Path::new(
Include::Just(msg_id),
@@ -132,7 +132,7 @@ mod sessions {
];
for path in paths.iter() {
let reg = Register::new(id.clone(), RegMsg::AddRoute(path.clone()));
queue.send(Message::new(NameType::None, reg));
queue.send(Message::new(reg));
rx.recv_timeout(TIMEOUT).unwrap();
}
Self {
@@ -146,7 +146,7 @@ mod sessions {
where
A: Into<MsgAction>,
{
Message::new(Session::doc_names()[0].clone(), action)
Message::new(action)
}
fn recv(&self) -> Result<Message, RecvTimeoutError> {
@@ -159,7 +159,7 @@ mod sessions {
fn send_registry_message(&self, msg: RegMsg) {
let request = Register::new(self.sender_id.clone(), msg);
self.queue.send(Message::new(NameType::None, request));
self.queue.send(Message::new(request));
}
}