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

Aizvērti
igalic vēlas iekļaut 6 iesūtījumus no igalic/Plume:refactor/extract-searcher-with-dbpool zarā main
igalic pievienoja piebildi 2020-07-23 18:32:18 +00:00
Īpašnieks

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 apstiprināja šīs izmaiņas 2020-07-23 18:35:10 +00:00
kiwii pievienoja piebildi
Īpašnieks

👌

👌
@ -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();
kiwii pievienoja piebildi 2020-07-23 18:33:55 +00:00
Īpašnieks

I would prefer using ? instead of unwrap here.

I would prefer using `?` instead of `unwrap` here.
igalic pievienoja piebildi 2020-07-23 19:35:57 +00:00
Autors
Īpašnieks

can you briefly explain why?

we use .unwrap() in all other lines.

can you briefly explain why? we use `.unwrap()` in all other lines.
kiwii pievienoja piebildi 2020-07-24 10:12:20 +00:00
Īpašnieks

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();
kiwii pievienoja piebildi 2020-07-23 18:34:24 +00:00
Īpašnieks

Same here.

Same here.
igalic izskatīja 2020-07-24 14:49:47 +00:00
igalic pievienoja piebildi
Autors
Īpašnieks

👀

👀
@ -40,6 +40,7 @@ pub enum Error {
Io(std::io::Error),
MissingApProperty,
NotFound,
DbPool,
igalic pievienoja piebildi 2020-07-24 14:48:48 +00:00
Autors
Īpašnieks

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

you're not trying to convert the original `diesel::r2d2::Error`?
kiwii pievienoja piebildi 2020-07-24 15:33:01 +00:00
Īpašnieks

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.
igalic pievienoja piebildi 2020-07-24 15:37:17 +00:00
Autors
Īpašnieks

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),
igalic pievienoja piebildi 2020-07-24 14:49:35 +00:00
Autors
Īpašnieks

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 izskatīja 2020-07-24 15:46:38 +00:00
igalic pievienoja piebildi
Autors
Īpašnieks

🙋🏻‍♀️

🙋🏻‍♀️
@ -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> {
igalic pievienoja piebildi 2020-07-24 15:45:31 +00:00
Autors
Īpašnieks

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 veica uzspiestu aizgādāšanu zarā refactor/extract-searcher-with-dbpool no 9309ed279f uz a5c81498b2 2020-07-24 20:12:17 +00:00 Salīdzināt
igalic pievienoja 1 iesūtījumu 2020-07-25 08:05:45 +00:00
this will not compile, so now it's time to fix the rest
igalic pievienoja piebildi 2020-07-26 19:37:26 +00:00
Autors
Īpašnieks

closing in favour of #813

closing in favour of #813
igalic aizvēra šo izmaiņu pieprasījumu 2020-07-26 19:37:26 +00:00

Izmaiņu pieprasījums aizvērts

Nepieciešams pieteikties, lai pievienotos šai sarunai.
Nav izskatītāju
Nav atskaites punkta
Nav projektu
Nav atbildīgo
2 dalībnieki
Paziņojumi
Izpildes datums
Izpildes datums nav derīgs vai tas ir ārpus datumu apgabala. Lūgums izmantot pierakstu "gggg-mm-dd".

Nav uzstādīts izpildes datums.

Atkarības

Nav atkarību.

Atsauce: Plume/Plume#809
Nav sniegts apraksts.