From 5833d20ea628c1e8b0aae3db5a9e8d9ae68c31d2 Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Fri, 30 Jan 2026 13:58:55 -0500 Subject: [PATCH] Moved queue into separate module. --- src/document/clock.rs | 8 +++++--- src/document/create.rs | 6 ++++-- src/document/definition.rs | 2 +- src/document/session.rs | 8 +++++--- src/lib.rs | 9 +++++---- src/message.rs | 2 +- src/queue.rs | 2 ++ src/{ => queue}/data_director.rs | 2 +- src/{ => queue}/router.rs | 4 ++-- 9 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 src/queue.rs rename src/{ => queue}/data_director.rs (99%) rename src/{ => queue}/router.rs (98%) diff --git a/src/document/clock.rs b/src/document/clock.rs index 1fcf8ac..54758fb 100644 --- a/src/document/clock.rs +++ b/src/document/clock.rs @@ -1,8 +1,10 @@ use crate::{ - data_director::{RegMsg, Register}, message::{Message, MsgAction, Records}, name::{Name, NameType, Names}, - router::Queue, + queue::{ + data_director::{RegMsg, Register}, + router::Queue, + }, }; use std::{ sync::mpsc::channel, @@ -48,7 +50,7 @@ impl Clock { #[cfg(test)] mod clocks { use super::*; - use crate::data_director::{Include, Path}; + use crate::queue::data_director::{Include, Path}; use chrono::{TimeDelta, Utc}; static TIMEOUT: Duration = Duration::from_millis(1500); diff --git a/src/document/create.rs b/src/document/create.rs index b8bed26..0f9e145 100644 --- a/src/document/create.rs +++ b/src/document/create.rs @@ -1,5 +1,4 @@ use crate::{ - data_director::{Include, Path, RegMsg, Register, RouteID}, document::{ definition::{DocDef, DocFuncType}, field::Field, @@ -10,7 +9,10 @@ use crate::{ }, mtterror::MTTError, name::NameType, - router::Queue, + queue::{ + data_director::{Include, Path, RegMsg, Register, RouteID}, + router::Queue, + }, }; use std::{ collections::{HashMap, HashSet}, diff --git a/src/document/definition.rs b/src/document/definition.rs index 72d34ca..8ee8321 100644 --- a/src/document/definition.rs +++ b/src/document/definition.rs @@ -1,5 +1,4 @@ use crate::{ - data_director::{Include, Path}, document::{ create::IndexType, field::{Field, FieldType}, @@ -7,6 +6,7 @@ use crate::{ message::{Action, CalcValue, MsgAction}, mtterror::MTTError, name::{Name, NameType, Names}, + queue::data_director::{Include, Path}, }; use std::collections::{HashMap, HashSet}; use uuid::Uuid; diff --git a/src/document/session.rs b/src/document/session.rs index d4b2f95..5861b72 100644 --- a/src/document/session.rs +++ b/src/document/session.rs @@ -1,5 +1,4 @@ use crate::{ - data_director::{Include, Path, RegMsg, Register}, document::{ create::IndexType, definition::{DocDef, DocFuncType}, @@ -7,7 +6,10 @@ use crate::{ }, message::{Action, CalcValue, Calculation, Delete, Message, Operand, Query, Update}, name::{Name, NameType}, - router::Queue, + queue::{ + data_director::{Include, Path, RegMsg, Register}, + router::Queue, + }, }; use std::{sync::mpsc::channel, time::Duration}; @@ -86,11 +88,11 @@ impl Session { mod sessions { use super::*; use crate::{ - data_director::{Include, Path, RegMsg, Register}, document::{clock::Clock, create::CreateDoc, field::Field}, message::{Addition, MsgAction, Query, Records}, mtterror::MTTError, name::{Name, NameType, Names}, + queue::data_director::{Include, Path, RegMsg, Register}, support_tests::TIMEOUT, }; use chrono::{DateTime, Utc}; diff --git a/src/lib.rs b/src/lib.rs index 7c75e48..09bde08 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,11 +1,9 @@ -mod data_director; mod document; mod message; mod mtterror; mod name; -mod router; +mod queue; -use data_director::{Include, Path, RegMsg, Register}; use document::{ clock::Clock, create::CreateDoc, @@ -15,7 +13,10 @@ use document::{ use message::{Action, Addition, CalcValue, Calculation, Message, Operand}; pub use message::{MsgAction, Query}; use name::{Name, NameType}; -use router::Queue; +use queue::{ + data_director::{Include, Path, RegMsg, Register}, + router::Queue, +}; use std::sync::mpsc::{channel, Receiver}; use uuid::Uuid; diff --git a/src/message.rs b/src/message.rs index bc861a5..ba2f942 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,11 +1,11 @@ use crate::{ - data_director::{Include, Path, Register, Route}, document::{ definition::DocDef, field::{Field, FieldType}, }, mtterror::MTTError, name::{NameType, Names}, + queue::data_director::{Include, Path, Register, Route}, }; use chrono::prelude::*; use std::{ diff --git a/src/queue.rs b/src/queue.rs new file mode 100644 index 0000000..af6dbc8 --- /dev/null +++ b/src/queue.rs @@ -0,0 +1,2 @@ +pub mod data_director; +pub mod router; diff --git a/src/data_director.rs b/src/queue/data_director.rs similarity index 99% rename from src/data_director.rs rename to src/queue/data_director.rs index dadc6df..fbf3e66 100644 --- a/src/data_director.rs +++ b/src/queue/data_director.rs @@ -2,7 +2,7 @@ use crate::{ message::{Action, Message, MsgAction}, mtterror::MTTError, name::{Name, NameType, Names}, - router::Queue, + queue::router::Queue, }; use std::{ collections::{HashMap, HashSet}, diff --git a/src/router.rs b/src/queue/router.rs similarity index 98% rename from src/router.rs rename to src/queue/router.rs index a2587e5..d2570a1 100644 --- a/src/router.rs +++ b/src/queue/router.rs @@ -1,8 +1,8 @@ use crate::{ - data_director::{DocRegistry, RegMsg, Register}, message::Message, mtterror::MTTError, name::NameType, + queue::data_director::{DocRegistry, RegMsg, Register}, }; use std::{ collections::HashMap, @@ -244,9 +244,9 @@ mod routers { mod queues { use super::*; use crate::{ - data_director::{Include, Path}, message::MsgAction, name::Name, + queue::data_director::{Include, Path}, support_tests::TIMEOUT, }; use std::sync::mpsc::{Receiver, RecvTimeoutError};