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 強制推送了 refactor/extract-searcher-with-dbpool 自 9309ed279fa5c81498b2 1 年前
igalic 加入了 1 個提交 1 年前
發佈者
擁有者

closing in favour of #813

closing in favour of #813
igalic 關閉了這個合併請求 1 年前

審核者

kiwii 核可了這些變更 1 年前
請重新開放此合併請求以進行合併作業。
登入 才能加入這對話。
沒有審核者
未選擇里程碑
沒有成員
2 參與者
通知
截止日期

未設定截止日期。

先決條件

此合併求目前沒有任何先決條件。

載入中…
尚未有任何內容