test concurent get q from db/cache

Reviewed-on: #3

.drone.yml

@@ -0,0 +1,13 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: rust:1-alpine
+  commands:
+  - apk add --no-cache musl-dev
+  - cargo fetch
+  - cargo build --all
+  environment:
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse

.gitignore

@@ -1,4 +1,4 @@
 /target
 **/*.rs.bk
-
+db.dat
-/db
+/db

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qchgk_web"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Dmitry <b4tm4n@mail.ru>"]
 edition = "2021"
 license = "MIT"
@@ -11,21 +11,14 @@ readme = "README.md"
 
 [dependencies]
 rand="0.8"
-serde="1.0"
+rocket = { version = "=0.5.0-rc.3", features = ["json"] }
-serde_json="1.0"
+rocket_dyn_templates = { version = "=0.1.0-rc.3", features = ["tera"] }
-ledb = {git = "https://github.com/b4tman/ledb.git", rev="a646b90e", package="ledb"}
+chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="699478f85e", package="chgk_ledb_lib", features=["async"]}
-rocket="0.4"
+mini-moka = "0.10.0"
-chgk_ledb_lib = {git = "https://gitea.b4tman.ru/b4tman/chgk_ledb.git", rev="e521e39f5e", package="chgk_ledb_lib"}
-
-# lmdb-zero="0.4"
-
-[dependencies.rocket_contrib]
-version = "0.4"
-default-features = false
-features = ["serve", "tera_templates"]
 
 [profile.release]
 opt-level = 3
 debug = false
 lto = true
 strip = true
+

src/main.rs

@@ -1,25 +1,27 @@
-#![feature(proc_macro_hygiene, decl_macro)]
-
-extern crate ledb;
-extern crate serde;
-extern crate serde_json;
-
 #[macro_use]
 extern crate rocket;
-extern crate rocket_contrib;
 
+use rocket::fs::FileServer;
+use rocket::futures::FutureExt;
 use rocket::response::Redirect;
-use rocket::{Rocket, State};
+use rocket::State;
-use rocket_contrib::serve::StaticFiles;
+use rocket_dyn_templates::tera;
-use rocket_contrib::templates::Template;
+use rocket_dyn_templates::Template;
 
 use rand::distributions::Uniform;
 use rand::Rng;
 
-use ledb::{Options, Storage};
+use std::ops::Deref;
+use std::sync::Arc;
 
+use chgk_ledb_lib::async_db;
 use chgk_ledb_lib::questions::Question;
 
+use mini_moka::sync::Cache;
+use std::time::Duration;
+
+const DB_FILENAME: &str = "db.dat";
+
 trait ErrorEmpty {
     type Output;
     fn err_empty(self) -> Result<Self::Output, ()>;
@@ -32,60 +34,114 @@ impl<T, E> ErrorEmpty for Result<T, E> {
     }
 }
 
+#[derive(Clone)]
+struct ArcTemplateData {
+    value: Arc<tera::Value>,
+}
+
+impl ArcTemplateData {
+    fn new(value: tera::Value) -> ArcTemplateData {
+        ArcTemplateData {
+            value: Arc::new(value),
+        }
+    }
+    fn render(&self, name: &'static str) -> Template {
+        Template::render(name, self.value.deref())
+    }
+}
+
+type TemplateCache = mini_moka::sync::Cache<usize, ArcTemplateData>;
+
+type DataBaseInner = async_db::Reader<Question>;
+type DataBase = Arc<DataBaseInner>;
 struct AppState {
-    storage: Storage,
+    db: DataBase,
-    database_distribution: Uniform<u32>,
+    database_distribution: Uniform<usize>,
 }
 
-fn get_database_distribution(storage: &Storage) -> Uniform<u32> {
+impl From<DataBaseInner> for AppState {
-    let collection = storage
+    fn from(db: DataBaseInner) -> Self {
-        .collection("questions")
+        let last_id = db.len();
-        .expect("collection \"questions\"");
+        let database_distribution = rand::distributions::Uniform::new_inclusive(1usize, last_id);
-    let last_id = collection.last_id().expect("\"questions\" last_id");
+        let db = Arc::new(db);
 
-    rand::distributions::Uniform::new_inclusive(1u32, last_id)
+        Self {
+            db,
+            database_distribution,
+        }
+    }
 }
 
-fn random_question_id(database_distribution: &Uniform<u32>) -> u32 {
+fn random_question_id(database_distribution: &Uniform<usize>) -> usize {
     let mut rng = rand::thread_rng();
     rng.sample(database_distribution)
 }
 
-fn get_question(storage: &Storage, id: u32) -> Result<Question, ()> {
+async fn get_question(db: &DataBase, id: usize) -> Result<Question, ()> {
-    storage
+    db.get(id - 1).await.err_empty()
-        .collection("questions")
-        .err_empty()?
-        .get::<Question>(id)
-        .err_empty()?
-        .ok_or(())
 }
 
-fn show_question_details(template_name: &'static str, data: &AppState, id: u32) -> Template {
+async fn show_question_details(
-    match get_question(&data.storage, id) {
+    template_name: &'static str,
-        Ok(question) => {
+    data: &AppState,
-            let mut context = serde_json::to_value(question).expect("question serialize");
+    cache: &TemplateCache,
-            if context.is_object() {
+    id: usize,
-                let next_id = random_question_id(&data.database_distribution);
+) -> Template {
-                context["next"] = serde_json::to_value(next_id).expect("question id serialize");
+    let cache_cloned = cache.clone();
+
+    let from_cache = rocket::tokio::spawn(async move { cache_cloned.get(&id) }).fuse();
+    let from_db = async move {
+        match get_question(&data.db, id).await {
+            Ok(question) => {
+                let mut context = tera::to_value(question).expect("question serialize");
+                if context.is_object() {
+                    let next_id = random_question_id(&data.database_distribution);
+                    context["next"] = tera::to_value(next_id).expect("question id serialize");
+                }
+
+                let value = ArcTemplateData::new(context);
+                let result = value.render(template_name);
+                cache.insert(id, value);
+
+                result
+            }
+            Err(_) => {
+                use std::collections::HashMap;
+                let context: HashMap<String, String> = HashMap::new();
+                Template::render("404", context)
             }
-            Template::render(template_name, &context)
         }
-        Err(_) => {
+    }
-            use std::collections::HashMap;
+    .fuse();
-            let context: HashMap<String, String> = HashMap::new();
+
-            Template::render("404", &context)
+    loop {
+        rocket::tokio::select! {
+            biased;
+
+            Ok(Some(template)) = from_cache => {
+                println!("from cache");
+                break template.render(template_name)
+            },
+            template = from_db => {
+                println!("from db");
+                break template
+            }
         }
     }
 }
 
 #[get("/q/<id>")]
-fn show_question(data: State<AppState>, id: u32) -> Template {
+async fn show_question(
-    show_question_details("question", data.inner(), id)
+    data: &State<AppState>,
+    cache: &State<TemplateCache>,
+    id: usize,
+) -> Template {
+    show_question_details("question", data.inner(), cache.inner(), id).await
 }
 
 #[get("/q/<id>/a")]
-fn show_answer(data: State<AppState>, id: u32) -> Template {
+async fn show_answer(data: &State<AppState>, cache: &State<TemplateCache>, id: usize) -> Template {
-    show_question_details("answer", data.inner(), id)
+    show_question_details("answer", data.inner(), cache.inner(), id).await
 }
 
 #[get("/q/0")]
@@ -99,7 +155,7 @@ fn answer0() -> Redirect {
 }
 
 #[get("/")]
-fn index(data: State<AppState>) -> Redirect {
+fn index(data: &State<AppState>) -> Redirect {
     let id = random_question_id(&data.database_distribution);
     Redirect::temporary(format!("/q/{}", id))
 }
@@ -108,36 +164,29 @@ fn index(data: State<AppState>) -> Redirect {
 fn not_found(_req: &rocket::Request) -> Template {
     use std::collections::HashMap;
     let context: HashMap<String, String> = HashMap::new();
-    Template::render("404", &context)
+    Template::render("404", context)
 }
 
-fn rocket() -> Rocket {
+#[launch]
-    let options: Options = serde_json::from_value(serde_json::json!({
+async fn rocket() -> _ {
-    "read_only": true,
+    let state: AppState = async_db::Reader::new(DB_FILENAME)
-    "no_lock": true,
+        .await
-    }))
+        .expect("open db")
-    .unwrap();
+        .into();
+    let cache: TemplateCache = Cache::builder()
+        .time_to_idle(Duration::from_secs(15 * 60))
+        .max_capacity(300)
+        .build();
 
-    let mut state = AppState {
+    rocket::build()
-        storage: Storage::new("db", options).expect("open db"),
-        database_distribution: Uniform::new(1, 3),
-    };
-    state.database_distribution = get_database_distribution(&state.storage);
-
-    let state = state;
-
-    rocket::ignite()
         .manage(state)
-        .register(catchers![not_found])
+        .manage(cache)
+        .register("/", catchers![not_found])
         .mount(
             "/",
             routes![index, show_question, show_answer, question0, answer0],
         )
         .mount("/q", routes![index])
-        .mount("/q/static", StaticFiles::from("static/"))
+        .mount("/q/static", FileServer::from("static/"))
         .attach(Template::fairing())
 }
-
-fn main() {
-    rocket().launch();
-}