1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
use async_trait::async_trait;
use futures::StreamExt;
use futures::{future::join_all, stream::FuturesUnordered};
use merino_settings::providers::MultiplexerConfig;
use merino_suggest_traits::{
convert_config, reconfigure_or_remake, CacheInputs, CacheStatus, MakeFreshType, SetupError,
SuggestError, SuggestionProvider, SuggestionRequest, SuggestionResponse,
};
pub struct Multi {
providers: Vec<Box<dyn SuggestionProvider>>,
}
impl Multi {
pub fn new(providers: Vec<Box<dyn SuggestionProvider>>) -> Self {
Self { providers }
}
pub fn new_boxed(providers: Vec<Box<dyn SuggestionProvider>>) -> Box<Self> {
Box::new(Self::new(providers))
}
}
#[async_trait]
impl SuggestionProvider for Multi {
fn name(&self) -> String {
let provider_names = self
.providers
.iter()
.map(|p| p.name())
.collect::<Vec<_>>()
.join(", ");
format!("Multi({})", provider_names)
}
fn cache_inputs(&self, req: &SuggestionRequest, cache_inputs: &mut dyn CacheInputs) {
for provider in &self.providers {
provider.cache_inputs(req, cache_inputs);
}
}
async fn suggest(
&self,
request: SuggestionRequest,
) -> Result<SuggestionResponse, SuggestError> {
let v: Result<Vec<SuggestionResponse>, _> =
join_all(self.providers.iter().map(|p| p.suggest(request.clone())))
.await
.into_iter()
.collect();
v.map(|mut responses| {
let mut rv = responses
.pop()
.unwrap_or_else(|| SuggestionResponse::new(vec![]));
for response in responses {
rv.suggestions.extend_from_slice(&response.suggestions);
rv.cache_status = match (rv.cache_status, response.cache_status) {
(a, b) if a == b => a,
(a, CacheStatus::NoCache) => a,
_ => CacheStatus::Mixed,
}
}
rv
})
}
async fn reconfigure(
&mut self,
new_config: serde_json::Value,
make_fresh: &MakeFreshType,
) -> Result<(), SetupError> {
let new_config: MultiplexerConfig = convert_config(new_config)?;
if new_config.providers.len() == self.providers.len() {
for (conf, prov) in new_config
.providers
.into_iter()
.zip(self.providers.iter_mut())
{
reconfigure_or_remake(prov, conf, make_fresh).await?;
}
} else {
self.providers.truncate(0);
let mut queue = FuturesUnordered::new();
for conf in new_config.providers {
queue.push(make_fresh(conf));
}
while let Some(result) = queue.next().await {
self.providers.push(result?);
}
}
Ok(())
}
}
#[cfg(test)]
mod tests {
use super::Multi;
use crate::FixedProvider;
use async_trait::async_trait;
use fake::{Fake, Faker};
use futures::{future::ready, FutureExt};
use merino_settings::providers::{FixedConfig, MultiplexerConfig, SuggestionProviderConfig};
use merino_suggest_traits::{
CacheStatus, MakeFreshType, NullProvider, SetupError, SuggestError, SuggestionProvider,
SuggestionRequest, SuggestionResponse,
};
use tokio::sync::oneshot::error::TryRecvError;
struct ChannelProvider {
tx: tokio::sync::mpsc::Sender<()>,
rx: tokio::sync::Mutex<tokio::sync::mpsc::Receiver<()>>,
}
#[async_trait]
impl SuggestionProvider for ChannelProvider {
fn name(&self) -> String {
"channel".to_string()
}
async fn suggest(
&self,
_request: SuggestionRequest,
) -> Result<SuggestionResponse, SuggestError> {
self.tx.send(()).await.unwrap();
self.rx.lock().await.recv().await.unwrap();
Ok(SuggestionResponse {
cache_status: CacheStatus::NoCache,
cache_ttl: None,
suggestions: vec![],
})
}
async fn reconfigure(
&mut self,
_new_config: serde_json::Value,
_make_fresh: &MakeFreshType,
) -> Result<(), SetupError> {
unimplemented!()
}
}
#[tokio::test]
async fn multi_is_concurrent() {
let (prov1_input_tx, prov1_input_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov1_output_tx, mut prov1_output_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov2_input_tx, prov2_input_rx) = tokio::sync::mpsc::channel::<()>(4);
let (prov2_output_tx, mut prov2_output_rx) = tokio::sync::mpsc::channel::<()>(4);
let (suggestion_result_tx, mut suggestion_result_rx) =
tokio::sync::oneshot::channel::<()>();
let prov1 = ChannelProvider {
tx: prov1_output_tx,
rx: tokio::sync::Mutex::new(prov1_input_rx),
};
let prov2 = ChannelProvider {
tx: prov2_output_tx,
rx: tokio::sync::Mutex::new(prov2_input_rx),
};
let multi = Multi::new(vec![Box::new(prov1), Box::new(prov2)]);
let task_handle = tokio::spawn(async move {
let request: SuggestionRequest = Faker.fake();
multi.suggest(request).await.unwrap();
suggestion_result_tx.send(()).unwrap();
});
tokio::join!(prov1_output_rx.recv(), prov2_output_rx.recv());
assert!(matches!(
suggestion_result_rx.try_recv(),
Err(TryRecvError::Empty)
));
prov1_input_tx.send(()).await.unwrap();
assert!(matches!(
suggestion_result_rx.try_recv(),
Err(TryRecvError::Empty)
));
prov2_input_tx.send(()).await.unwrap();
suggestion_result_rx.await.unwrap();
task_handle.await.unwrap();
}
#[tokio::test]
async fn test_reconfigure_optimisitc() {
let prov_fixed = FixedProvider {
value: "foo".to_owned(),
};
let prov_null = NullProvider;
let mut provider = Multi::new(vec![Box::new(prov_fixed), Box::new(prov_null)]);
let make_fresh: MakeFreshType = Box::new(move |_fresh_config: SuggestionProviderConfig| {
unreachable!();
});
let value = serde_json::to_value(MultiplexerConfig {
providers: vec![
SuggestionProviderConfig::Fixed(FixedConfig {
value: "bar".to_owned(),
}),
SuggestionProviderConfig::Null,
],
})
.expect("failed to serialize");
provider
.reconfigure(value, &make_fresh)
.await
.expect("failed to reconfigure");
assert_eq!(provider.providers.len(), 2);
let response = provider
.suggest(Faker.fake())
.await
.expect("failed to suggest");
assert_eq!(response.suggestions.len(), 1);
assert_eq!(response.suggestions[0].title, "bar");
}
#[tokio::test]
async fn test_reconfigure_pessimisitc() {
let prov_fixed = FixedProvider {
value: "foo".to_owned(),
};
let prov_null = NullProvider;
let mut provider = Multi::new(vec![Box::new(prov_fixed), Box::new(prov_null)]);
let make_fresh: MakeFreshType = Box::new(move |fresh_config: SuggestionProviderConfig| {
let provider: Box<dyn SuggestionProvider> = match fresh_config {
SuggestionProviderConfig::Fixed(config) => Box::new(FixedProvider {
value: config.value,
}),
SuggestionProviderConfig::Null => Box::new(NullProvider),
_ => unreachable!(),
};
ready(Ok(provider)).boxed()
});
let value = serde_json::to_value(MultiplexerConfig {
providers: vec![
SuggestionProviderConfig::Fixed(FixedConfig {
value: "bar".to_owned(),
}),
SuggestionProviderConfig::Fixed(FixedConfig {
value: "baz".to_owned(),
}),
SuggestionProviderConfig::Null,
],
})
.expect("failed to serialize");
provider
.reconfigure(value, &make_fresh)
.await
.expect("failed to reconfigure");
assert_eq!(provider.providers.len(), 3);
let response = provider
.suggest(Faker.fake())
.await
.expect("failed to suggest");
assert_eq!(response.suggestions.len(), 2);
assert_eq!(response.suggestions[0].title, "bar");
assert_eq!(response.suggestions[1].title, "baz");
}
}