plume-model: refactor Searcher to have its own DbPool

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 godkände dessa ändringar 4 månader sedan

👌

plume-models/src/search/searcher.rs

kiwii kommenterad 4 månader sedan

I would prefer using ? instead of unwrap here.

igalic kommenterad 4 månader sedan

can you briefly explain why?

we use .unwrap() in all other lines.

kiwii kommenterad 4 månader sedan

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.

plume-models/src/search/searcher.rs

igalic granskad av 4 månader sedan

👀

plume-models/src/lib.rs

plume-models/src/search/searcher.rs

igalic granskad av 4 månader sedan

🙋🏻‍♀️

plume-models/src/search/searcher.rs

igalic refererade till denna pull-förfrågan 4 månader sedan

WIP: Extract DbConn, Searcher & Worker into Riker Actors #813

closing in favour of #813

igalic closed this pull request 4 månader sedan

Granskare

kiwii godkände dessa ändringar 4 månader sedan

Vänligen återöppna denna Pull-förfrågan igen för att utföra sammanfogningen.

Logga in för att delta i denna konversation.

kiwii

Ingen Etikett

Ingen Milsten

Ingen tilldelad

2 Deltagare

Notiser

Förfallodatum

Inget förfallodatum satt.

Beroenden

Denna pull-förfrågan har för närvarande inga beroenden.

@@ -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();

@@ -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();

@@ -40,6 +40,7 @@ pub enum Error {
     Io(std::io::Error),
     MissingApProperty,
     NotFound,
     DbPool,

@@ -177,1 +188,4 @@
         let conn = match self.dbpool.get() {
             Ok(c) => c,
             Err(_) => return Err(Error::DbPool),

@@ -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> {

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

Granskare