|
1 |
| -use std::cell::RefCell; |
| 1 | +use anyhow::anyhow; |
2 | 2 | use std::collections::HashMap;
|
3 |
| -use std::rc::Rc; |
4 | 3 |
|
5 | 4 | use petgraph::graph::NodeIndex;
|
6 | 5 | use petgraph::stable_graph::StableDiGraph;
|
7 | 6 |
|
8 |
| -use super::Request; |
9 | 7 | use super::RequestEdgeType;
|
10 |
| -use super::RequestError; |
11 | 8 | use super::RequestGraph;
|
12 | 9 | use super::RequestNode;
|
13 | 10 | use super::RequestResult;
|
| 11 | +use super::{Request, RunRequestContext, RunRequestError}; |
14 | 12 |
|
15 |
| -#[derive(Clone)] |
16 |
| -pub struct RequestTracker<T: Clone> { |
17 |
| - parent_request_hash: Option<u64>, |
18 |
| - graph: Rc<RefCell<RequestGraph<T>>>, |
19 |
| - request_index: Rc<RefCell<HashMap<u64, NodeIndex>>>, |
| 13 | +pub struct RequestTracker<T> { |
| 14 | + graph: RequestGraph<T>, |
| 15 | + request_index: HashMap<u64, NodeIndex>, |
20 | 16 | }
|
21 | 17 |
|
22 | 18 | impl<T: Clone> RequestTracker<T> {
|
23 | 19 | pub fn new() -> Self {
|
24 | 20 | let mut graph = StableDiGraph::<RequestNode<T>, RequestEdgeType>::new();
|
25 | 21 | graph.add_node(RequestNode::Root);
|
26 | 22 | RequestTracker {
|
27 |
| - parent_request_hash: None, |
28 |
| - graph: Rc::new(RefCell::new(graph)), |
29 |
| - request_index: Rc::new(RefCell::new(HashMap::new())), |
| 23 | + graph, |
| 24 | + request_index: HashMap::new(), |
30 | 25 | }
|
31 | 26 | }
|
32 | 27 |
|
33 |
| - pub fn run_request(&self, request: Box<&dyn Request<T>>) -> Result<T, Vec<RequestError>> { |
| 28 | + pub fn run_request(&mut self, request: Box<&dyn Request<T>>) -> anyhow::Result<T> { |
| 29 | + self.run_child_request(request, None) |
| 30 | + } |
| 31 | + |
| 32 | + pub fn run_child_request( |
| 33 | + &mut self, |
| 34 | + request: Box<&dyn Request<T>>, |
| 35 | + parent_request_hash: Option<u64>, |
| 36 | + ) -> anyhow::Result<T> { |
34 | 37 | let request_id = request.id();
|
35 | 38 |
|
36 |
| - if self.prepare_request(request_id.clone()) { |
37 |
| - let mut rt = self.clone(); |
38 |
| - rt.parent_request_hash.replace(request_id.clone()); |
39 |
| - self.store_request(&request_id, request.run(rt)); |
| 39 | + if self.prepare_request(request_id.clone())? { |
| 40 | + let result = request.run(RunRequestContext::new(Some(request_id), self)); |
| 41 | + self.store_request(&request_id, result)?; |
40 | 42 | }
|
41 | 43 |
|
42 |
| - self.get_request(&request_id) |
| 44 | + Ok(self.get_request(parent_request_hash, &request_id)?) |
43 | 45 | }
|
44 | 46 |
|
45 |
| - fn prepare_request(&self, request_id: u64) -> bool { |
46 |
| - let mut graph = self.graph.borrow_mut(); |
47 |
| - let mut request_index = self.request_index.borrow_mut(); |
48 |
| - |
49 |
| - let node_index = request_index |
| 47 | + fn prepare_request(&mut self, request_id: u64) -> anyhow::Result<bool> { |
| 48 | + let node_index = self |
| 49 | + .request_index |
50 | 50 | .entry(request_id)
|
51 |
| - .or_insert_with(|| graph.add_node(RequestNode::Incomplete)); |
| 51 | + .or_insert_with(|| self.graph.add_node(RequestNode::Incomplete)); |
52 | 52 |
|
53 |
| - let request_node = graph.node_weight_mut(*node_index).unwrap(); |
| 53 | + let request_node = self |
| 54 | + .graph |
| 55 | + .node_weight_mut(*node_index) |
| 56 | + .ok_or_else(|| anyhow!("Failed to find request node"))?; |
54 | 57 |
|
55 | 58 | // Don't run if already run
|
56 | 59 | if let RequestNode::<T>::Valid(_) = request_node {
|
57 |
| - return false; |
| 60 | + return Ok(false); |
58 | 61 | }
|
59 | 62 |
|
60 | 63 | *request_node = RequestNode::Incomplete;
|
61 |
| - true |
| 64 | + Ok(true) |
62 | 65 | }
|
63 | 66 |
|
64 |
| - fn store_request(&self, request_id: &u64, result: Result<RequestResult<T>, Vec<RequestError>>) { |
65 |
| - let request_index = self.request_index.borrow(); |
66 |
| - let mut graph = self.graph.borrow_mut(); |
67 |
| - |
68 |
| - let node_index = request_index.get(&request_id).unwrap(); |
69 |
| - |
70 |
| - let request_node = graph.node_weight_mut(*node_index).unwrap(); |
| 67 | + fn store_request( |
| 68 | + &mut self, |
| 69 | + request_id: &u64, |
| 70 | + result: Result<RequestResult<T>, RunRequestError>, |
| 71 | + ) -> anyhow::Result<()> { |
| 72 | + let node_index = self |
| 73 | + .request_index |
| 74 | + .get(&request_id) |
| 75 | + .ok_or_else(|| anyhow!("Failed to find request"))?; |
| 76 | + let request_node = self |
| 77 | + .graph |
| 78 | + .node_weight_mut(*node_index) |
| 79 | + .ok_or_else(|| anyhow!("Failed to find request"))?; |
71 | 80 | if let RequestNode::<T>::Valid(_) = request_node {
|
72 |
| - return; |
| 81 | + return Ok(()); |
73 | 82 | }
|
74 | 83 | *request_node = match result {
|
75 | 84 | Ok(result) => RequestNode::Valid(result.result),
|
76 | 85 | Err(error) => RequestNode::Error(error),
|
77 | 86 | };
|
78 |
| - } |
79 | 87 |
|
80 |
| - fn get_request(&self, request_id: &u64) -> Result<T, Vec<RequestError>> { |
81 |
| - let mut graph = self.graph.borrow_mut(); |
82 |
| - let request_index = self.request_index.borrow(); |
| 88 | + Ok(()) |
| 89 | + } |
83 | 90 |
|
84 |
| - let Some(node_index) = request_index.get(&request_id) else { |
85 |
| - return Err(vec![RequestError::Impossible]); |
| 91 | + fn get_request( |
| 92 | + &mut self, |
| 93 | + parent_request_hash: Option<u64>, |
| 94 | + request_id: &u64, |
| 95 | + ) -> anyhow::Result<T> { |
| 96 | + let Some(node_index) = self.request_index.get(&request_id) else { |
| 97 | + return Err(anyhow!("Impossible error")); |
86 | 98 | };
|
87 | 99 |
|
88 |
| - if let Some(parent_request_id) = self.parent_request_hash { |
89 |
| - let parent_node_index = request_index.get(&parent_request_id).unwrap(); |
90 |
| - graph.add_edge( |
| 100 | + if let Some(parent_request_id) = parent_request_hash { |
| 101 | + let parent_node_index = self |
| 102 | + .request_index |
| 103 | + .get(&parent_request_id) |
| 104 | + .ok_or_else(|| anyhow!("Failed to find requests"))?; |
| 105 | + self.graph.add_edge( |
91 | 106 | parent_node_index.clone(),
|
92 | 107 | node_index.clone(),
|
93 | 108 | RequestEdgeType::SubRequest,
|
94 | 109 | );
|
95 | 110 | } else {
|
96 |
| - graph.add_edge( |
| 111 | + self.graph.add_edge( |
97 | 112 | NodeIndex::new(0),
|
98 | 113 | node_index.clone(),
|
99 | 114 | RequestEdgeType::SubRequest,
|
100 | 115 | );
|
101 | 116 | }
|
102 | 117 |
|
103 |
| - let Some(request_node) = graph.node_weight(node_index.clone()) else { |
104 |
| - return Err(vec![RequestError::Impossible]); |
| 118 | + let Some(request_node) = self.graph.node_weight(node_index.clone()) else { |
| 119 | + return Err(anyhow!("Impossible")); |
105 | 120 | };
|
106 | 121 |
|
107 | 122 | match request_node {
|
108 |
| - RequestNode::Root => Err(vec![RequestError::Impossible]), |
109 |
| - RequestNode::Incomplete => Err(vec![RequestError::Impossible]), |
110 |
| - RequestNode::Error(errors) => Err(errors.to_owned()), |
| 123 | + RequestNode::Root => Err(anyhow!("Impossible")), |
| 124 | + RequestNode::Incomplete => Err(anyhow!("Impossible")), |
| 125 | + RequestNode::Error(_errors) => Err(anyhow!("Impossible")), |
111 | 126 | RequestNode::Valid(value) => Ok(value.clone()),
|
112 | 127 | }
|
113 | 128 | }
|
|
0 commit comments