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

Закрито
igalic хоче злити 6 комітів з igalic/Plume:refactor/extract-searcher-with-dbpool в main
igalic прокоментував(ла) 1 рік тому
Власник

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.
igalic додав 1 коміт 1 рік тому
3b21eb766d
plume-model: refactor Searcher to have its own DbPool
kiwii зміни затверджено 1 рік тому
kiwii додав коментар

👌

let lang = schema.get_field("lang").unwrap();
let license = schema.get_field("license").unwrap();
let conn = self.dbpool.get().unwrap();
kiwii прокоментував(ла) 1 рік тому
Автор
Власник

I would prefer using ? instead of unwrap here.

I would prefer using `?` instead of `unwrap` here.
igalic прокоментував(ла) 1 рік тому
Автор
Власник

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 прокоментував(ла) 1 рік тому
Автор
Власник

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.
let searcher = self.reader.searcher();
let res = searcher.search(&query.into_query(), &collector).unwrap();
let conn = self.dbpool.get().unwrap();
kiwii прокоментував(ла) 1 рік тому
Автор
Власник

Same here.

Same here.
kiwii додав 1 коміт 1 рік тому
igalic рецензовано 1 рік тому
igalic додав коментар

👀

Io(std::io::Error),
MissingApProperty,
NotFound,
DbPool,
igalic прокоментував(ла) 1 рік тому
Автор
Власник

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

you're not trying to convert the original `diesel::r2d2::Error`?
kiwii прокоментував(ла) 1 рік тому
Автор
Власник

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 прокоментував(ла) 1 рік тому
Автор
Власник

gonna have to ask somebody how the heck this is happening

gonna have to ask somebody how the heck this is happening
let conn = match self.dbpool.get() {
Ok(c) => c,
Err(_) => return Err(Error::DbPool),
igalic прокоментував(ла) 1 рік тому
Автор
Власник

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
kiwii додав 1 коміт 1 рік тому
39ca7da3f0 Introduce Searcher::new
igalic рецензовано 1 рік тому
igalic додав коментар

🙋🏻‍♀️

///
/// 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 прокоментував(ла) 1 рік тому
Автор
Власник

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
kiwii додав 1 коміт 1 рік тому
igalic додав 1 коміт 1 рік тому
igalic виконав force-push refactor/extract-searcher-with-dbpool з 9309ed279f на a5c81498b2 1 рік тому
igalic додав 1 коміт 1 рік тому
igalic прокоментував(ла) 1 рік тому
Автор
Власник

closing in favour of #813

closing in favour of #813
igalic закрив цей запит на злиття 1 рік тому

Рецензенти

kiwii зміни затверджено 1 рік тому
Будь ласка перевідкрийте цей запит щоб здіснити операцію злиття.
Підпишіться щоб приєднатися до обговорення.
Немає рецензентів
Етап відсутній
Немає виконавеця
2 учасників
Сповіщення
Дата завершення

Термін виконання не встановлений.

Залежності

Цей запит на злиття в даний час не має залежностей.

Завантаження…
Тут ще немає жодного змісту.