plume-model: refactor Searcher to have its own DbPool #809

Fechado
igalic quer mesclar 6 commits de igalic/Plume:refactor/extract-searcher-with-dbpool em main
Proprietário(a)

This PR is another attempt at fixing #799

Instead of relying on a separate actor model, as described, we make use of the fact that DbPool is an Arc, and can be arbitrarily cloned, so we add it to Searcher. Further more, and db_pool.get() acts like sending a message to an Actor: if there are enough connections, the Pool gives us one, if not, tough luck!

this way, we don't need to pass along a conn into the searcher functions.
This should make splitting PlumeRocket up into its components a little easier.

This PR is another attempt at fixing #799 Instead of relying on a separate actor model, as described, we make use of the fact that DbPool is an `Arc`, and can be arbitrarily cloned, so we add it to `Searcher`. Further more, and `db_pool.get()` *acts* like sending a message to an Actor: if there are enough connections, the Pool gives us one, if not, tough luck! this way, we don't need to pass along a conn into the searcher functions. This should make splitting PlumeRocket up into its components a little easier.
kiwii aprovou estas alterações 2020-07-23 18:35:10 +00:00
kiwii deixou um comentário
Proprietário(a)

👌

👌
@ -175,15 +186,16 @@ impl Searcher {
let lang = schema.get_field("lang").unwrap();
let license = schema.get_field("license").unwrap();
let conn = self.dbpool.get().unwrap();
Proprietário(a)

I would prefer using ? instead of unwrap here.

I would prefer using `?` instead of `unwrap` here.
Autor
Proprietário(a)

can you briefly explain why?

we use .unwrap() in all other lines.

can you briefly explain why? we use `.unwrap()` in all other lines.
Proprietário(a)

I think all the previous ones are safe: we now it can't panic because we control the search index schema, we know that these fields exist (even if Rust can't check this at comoile-time). Here, we may fail to get a DB connection from the pool for whatever reason, and I think we should make the error "go up", so that the web UI or the CLI can display a proper error.

I think all the previous ones are safe: we now it can't panic because we control the search index schema, we know that these fields exist (even if Rust can't check this at comoile-time). Here, we may fail to get a DB connection from the pool for whatever reason, and I think we should make the error "go up", so that the web UI or the CLI can display a proper error.
@ -222,24 +229,27 @@ impl Searcher {
let searcher = self.reader.searcher();
let res = searcher.search(&query.into_query(), &collector).unwrap();
let conn = self.dbpool.get().unwrap();
Proprietário(a)

Same here.

Same here.
igalic revisou 2020-07-24 14:49:47 +00:00
igalic deixou um comentário
Autor
Proprietário(a)

👀

👀
plume-models/src/lib.rs Desatualizado
@ -40,6 +40,7 @@ pub enum Error {
Io(std::io::Error),
MissingApProperty,
NotFound,
DbPool,
Autor
Proprietário(a)

you're not trying to convert the original diesel::r2d2::Error?

you're not trying to convert the original `diesel::r2d2::Error`?
Proprietário(a)

It is a r2d2::Error, not the same as Diesel's one apparently. And I don't want to add another direct dependency in our Cargo.toml.

It is a `r2d2::Error`, not the same as Diesel's one apparently. And I don't want to add another direct dependency in our Cargo.toml.
Autor
Proprietário(a)

gonna have to ask somebody how the heck this is happening

gonna have to ask somebody how the heck this is happening
@ -177,1 +188,4 @@
let conn = match self.dbpool.get() {
Ok(c) => c,
Err(_) => return Err(Error::DbPool),
Autor
Proprietário(a)

that means we won't know exactly why the pool didn't give us a connection

that means we won't know exactly why the pool didn't give us a connection
igalic revisou 2020-07-24 15:46:38 +00:00
igalic deixou um comentário
Autor
Proprietário(a)

🙋🏻‍♀️

🙋🏻‍♀️
@ -31,0 +55,4 @@
///
/// The panic messages are normally explicit enough for a human to
/// understand how to fix the issue when they see it.
pub fn new(db_pool: DbPool) -> Arc<Self> {
Autor
Proprietário(a)

why are we returning Arc<Self>?
this means our code needs to know exactly how it's going to be used

what about cli? does that use an Arc?

i would use this function to only return a Self
there's no need to init_pool, we just want a copy

we can create an initialize method, which tries to call open and create methods in the appropriate order with the error recovery, if that makes sense here

but as it stands, for a new function, this does too much

why are we returning `Arc<Self>`? this means our code needs to know exactly how it's going to be used what about cli? does that use an Arc? i would use this function to only return a Self there's no need to init_pool, we just want a copy we can create an initialize method, which tries to call open and create *methods* in the appropriate order with the error recovery, if that makes sense here but as it stands, for a new function, this does too much
igalic forçou o push refactor/extract-searcher-with-dbpool de 9309ed279f para a5c81498b2 2020-07-24 20:12:17 +00:00 Comparar
igalic adicionou 1 commit 2020-07-25 08:05:45 +00:00
this will not compile, so now it's time to fix the rest
Autor
Proprietário(a)

closing in favour of #813

closing in favour of #813
igalic fechou este pull request 2020-07-26 19:37:26 +00:00

Pull Request Fechado

Inicie a sessão para participar desta conversa.
Sem revisor
Sem marco
Sem projeto
Sem responsáveis
2 participantes
Notificações
Data limite
A data limite é inválida ou está fora do intervalo permitido. Por favor, use o formato "yyyy-mm-dd".

Não há data limite definida.

Dependências

Não há dependências definidas.

Referência: Plume/Plume#809
Nenhuma descrição fornecida.