serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Execute State functions in thread pool

Browse source
This commit is contained in:
Magnus Hoff 2017-09-08 16:21:24 +02:00
parent b3e7552c16
commit 6fb1062376
4 changed files with 62 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -9,6 +9,7 @@ dependencies = [
"diesel 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"diesel_codegen 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libsqlite3-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",

1
Cargo.toml
View file

@ -5,6 +5,7 @@ authors = ["Magnus Hoff <maghoff@gmail.com>"]
[dependencies]
futures = "0.1"
futures-cpupool = "0.1"
hyper = "0.11"
tokio-io = "0.1"
tokio-proto = "0.1"

1
src/main.rs
View file

@ -7,6 +7,7 @@
extern crate chrono;
extern crate clap;
extern crate futures;
extern crate futures_cpupool;
extern crate hyper;
extern crate pulldown_cmark;
extern crate r2d2;

111
src/state.rs
View file

@ -3,7 +3,7 @@ use std;
use diesel;
use diesel::sqlite::SqliteConnection;
use diesel::prelude::*;
use futures::{Future, IntoFuture, BoxFuture};
use futures_cpupool::{self, CpuFuture};
use r2d2::Pool;
use r2d2_diesel::ConnectionManager;
@ -11,79 +11,86 @@ use models;
#[derive(Clone)]
pub struct State {
connection_pool: Pool<ConnectionManager<SqliteConnection>>
connection_pool: Pool<ConnectionManager<SqliteConnection>>,
cpu_pool: futures_cpupool::CpuPool,
}
pub type Error = Box<std::error::Error + Send + Sync>;
impl State {
pub fn new(connection_pool: Pool<ConnectionManager<SqliteConnection>>) -> State {
State { connection_pool }
State {
connection_pool,
cpu_pool: futures_cpupool::CpuPool::new_num_cpus(),
}
}
pub fn get_article_revision_by_id(&self, article_id: i32) -> BoxFuture<Option<models::ArticleRevision>, Error> {
(|| -> Result<_, _> {
pub fn get_article_revision_by_id(&self, article_id: i32) -> CpuFuture<Option<models::ArticleRevision>, Error> {
let connection_pool = self.connection_pool.clone();
self.cpu_pool.spawn_fn(move || {
use schema::article_revisions;
Ok(article_revisions::table
.filter(article_revisions::article_id.eq(article_id))
.order(article_revisions::revision.desc())
.limit(1)
.load::<models::ArticleRevision>(&*self.connection_pool.get()?)?
.load::<models::ArticleRevision>(&*connection_pool.get()?)?
.pop())
}()).into_future().boxed()
})
}
pub fn update_article(&self, article_id: i32, base_revision: i32, body: String) -> BoxFuture<models::ArticleRevision, Error> {
self.connection_pool.get().into_future()
.map_err(Into::into)
.and_then(move |conn| {
conn.transaction(|| {
use schema::article_revisions;
pub fn update_article(&self, article_id: i32, base_revision: i32, body: String) -> CpuFuture<models::ArticleRevision, Error> {
let connection_pool = self.connection_pool.clone();
let (latest_revision, title) = article_revisions::table
.filter(article_revisions::article_id.eq(article_id))
.order(article_revisions::revision.desc())
.limit(1)
.select((article_revisions::revision, article_revisions::title))
.load::<(i32, String)>(&*conn)?
.pop()
.unwrap_or_else(|| unimplemented!("TODO Missing an error type"));
self.cpu_pool.spawn_fn(move || {
let conn = connection_pool.get()?;
if latest_revision != base_revision {
// TODO: If it is the same edit repeated, just respond OK
// TODO: If there is a conflict, transform the edit to work seamlessly
unimplemented!("TODO Missing handling of revision conflicts");
}
let new_revision = base_revision + 1;
conn.transaction(|| {
use schema::article_revisions;
#[derive(Insertable)]
#[table_name="article_revisions"]
struct NewRevision<'a> {
article_id: i32,
revision: i32,
title: &'a str,
body: &'a str,
}
let (latest_revision, title) = article_revisions::table
.filter(article_revisions::article_id.eq(article_id))
.order(article_revisions::revision.desc())
.limit(1)
.select((article_revisions::revision, article_revisions::title))
.load::<(i32, String)>(&*conn)?
.pop()
.unwrap_or_else(|| unimplemented!("TODO Missing an error type"));
diesel::insert(&NewRevision {
article_id,
revision: new_revision,
title: &title,
body: &body,
})
.into(article_revisions::table)
.execute(&*conn)?;
if latest_revision != base_revision {
// TODO: If it is the same edit repeated, just respond OK
// TODO: If there is a conflict, transform the edit to work seamlessly
unimplemented!("TODO Missing handling of revision conflicts");
}
let new_revision = base_revision + 1;
Ok(article_revisions::table
.filter(article_revisions::article_id.eq(article_id))
.filter(article_revisions::revision.eq(new_revision))
.load::<models::ArticleRevision>(&*conn)?
.pop()
.expect("We just inserted this row!")
)
})
#[derive(Insertable)]
#[table_name="article_revisions"]
struct NewRevision<'a> {
article_id: i32,
revision: i32,
title: &'a str,
body: &'a str,
}
diesel::insert(&NewRevision {
article_id,
revision: new_revision,
title: &title,
body: &body,
})
.into(article_revisions::table)
.execute(&*conn)?;
Ok(article_revisions::table
.filter(article_revisions::article_id.eq(article_id))
.filter(article_revisions::revision.eq(new_revision))
.load::<models::ArticleRevision>(&*conn)?
.pop()
.expect("We just inserted this row!")
)
})
.boxed()
})
}
}