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

クローズ
igalicigalic/Plume:refactor/extract-searcher-with-dbpool から main への 6 コミットのマージを希望しています
igalic がコメント 4年前
オーナー

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 が変更を承認 4年前
kiwii がコメント
オーナー

👌

👌
@ -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 がコメント 4年前
オーナー

I would prefer using ? instead of unwrap here.

I would prefer using `?` instead of `unwrap` here.
igalic がコメント 4年前
投稿者
オーナー

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 がコメント 4年前
オーナー

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 がコメント 4年前
オーナー

Same here.

Same here.
igalic がレビュー 4年前
igalic がコメント
投稿者
オーナー

👀

👀
@ -40,6 +40,7 @@ pub enum Error {
Io(std::io::Error),
MissingApProperty,
NotFound,
DbPool,
igalic がコメント 4年前
投稿者
オーナー

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

you're not trying to convert the original `diesel::r2d2::Error`?
kiwii がコメント 4年前
オーナー

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 がコメント 4年前
投稿者
オーナー

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 がコメント 4年前
投稿者
オーナー

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 がレビュー 4年前
igalic がコメント
投稿者
オーナー

🙋🏻‍♀️

🙋🏻‍♀️
@ -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 がコメント 4年前
投稿者
オーナー

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 が refactor/extract-searcher-with-dbpool を強制プッシュ ( 9309ed279f から a5c81498b2 へ ) 4年前
igalic が 1 コミット追加 4年前
8f0fe5aaf9
remove Searcher from PlumeRocket and add a FromRequest to retrieve it
this will not compile, so now it's time to fix the rest
igalic がコメント 4年前
投稿者
オーナー

closing in favour of #813

closing in favour of #813
igalic がプルリクエストをクローズ 4年前

レビューア

kiwii が変更を承認 4年前
このプルリクエストをマージする場合は再オープンしてください。
サインインしてこの会話に参加。
レビューアなし
マイルストーンなし
担当者なし
2 人の参加者
通知
期日
期日が正しくないか範囲を超えています。 'yyyy-mm-dd' の形式で入力してください。

期日は未設定です。

依存関係

依存関係が設定されていません。

リファレンス: Plume/Plume#809
読み込み中…
まだ内容がありません