astro/treeadvisor
astro
/
treeadvisor
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: add a db pool

This commit is contained in:
Astro 2021-08-27 20:19:17 +02:00
parent 2374097d40
commit e69a4b6dd0
5 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/Cargo.toml
View File

@ -16,3 +16,4 @@ http = "0.2"
geo = "0.18" geo = "0.18"
cairo-rs = { version = "0.14", features = ["png"] } cairo-rs = { version = "0.14", features = ["png"] }
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
num_cpus = "1"

10
server/src/area.rs
View File

@ -17,12 +17,11 @@ pub fn get_details(state: State) -> (State, Response<Body>) {
let pe = PointExtractor::borrow_from(&state); let pe = PointExtractor::borrow_from(&state);
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let mut seen_srcs = HashSet::new(); let mut seen_srcs = HashSet::new();
let result = { let result = app_state.with_db(|db| {
let mut db = app_state.db.lock().unwrap();
db.query("SELECT src, attrs FROM areas WHERE coords @> $1::point ORDER BY coords <-> $1::point ASC", &[ db.query("SELECT src, attrs FROM areas WHERE coords @> $1::point ORDER BY coords <-> $1::point ASC", &[
&pe.to_point() &pe.to_point()
]).unwrap() ]).unwrap()
}.into_iter().filter(|row| { }).into_iter().filter(|row| {
let src: &str = row.get(0); let src: &str = row.get(0);
if seen_srcs.contains(src) { if seen_srcs.contains(src) {
false false
@ -43,12 +42,11 @@ pub fn get_details(state: State) -> (State, Response<Body>) {
pub fn get_heatmap(state: State) -> (State, Response<Body>) { pub fn get_heatmap(state: State) -> (State, Response<Body>) {
let pe = AreaExtractor::borrow_from(&state); let pe = AreaExtractor::borrow_from(&state);
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let result = { let result = app_state.with_db(|db| {
let mut db = app_state.db.lock().unwrap();
db.query("SELECT path(coords), src, attrs FROM areas WHERE box(coords) ?# $1::box", &[ db.query("SELECT path(coords), src, attrs FROM areas WHERE box(coords) ?# $1::box", &[
&pe.to_rect() &pe.to_rect()
]).unwrap() ]).unwrap()
}; });
const TILE_MAX: i32 = 256; const TILE_MAX: i32 = 256;
let (w, h) = if pe.w() > pe.h() { let (w, h) = if pe.w() > pe.h() {

28
server/src/main.rs
View File

@ -29,7 +29,23 @@ mod tiles;
#[derive(Clone, StateData)] #[derive(Clone, StateData)]
pub struct AppState { pub struct AppState {
pub db: Arc<Mutex<postgres::Client>>, pub db_pool: Vec<Arc<Mutex<postgres::Client>>>,
pub db_pool_index: Arc<Mutex<usize>>,
}
impl AppState {
pub fn with_db<F: Fn(&mut postgres::Client) -> R, R>(&self, f: F) -> R {
use std::ops::Deref;
let mut db_pool_index = self.db_pool_index.lock().unwrap();
let mut db = self.db_pool[*db_pool_index].lock().unwrap();
*db_pool_index += 1;
if *db_pool_index >= self.db_pool.len() {
*db_pool_index = 0;
}
f(&mut db)
}
} }
@ -119,11 +135,15 @@ impl TileExtractor {
fn main() { fn main() {
const DB_URL: &str = "host=10.233.1.2 dbname=treeadvisor user=treeadvisor password=123"; const DB_URL: &str = "host=10.233.1.2 dbname=treeadvisor user=treeadvisor password=123";
let db = postgres::Client::connect(DB_URL, postgres::NoTls) let cpus = num_cpus::get();
.expect("DB"); let db_pool = (0..cpus).map(|_| Arc::new(Mutex::new(
postgres::Client::connect(DB_URL, postgres::NoTls)
.expect("DB")
))).collect();
let state = AppState { let state = AppState {
db: Arc::new(Mutex::new(db)), db_pool: db_pool,
db_pool_index: Arc::new(Mutex::new(0)),
}; };
let (chain, pipelines) = single_pipeline( let (chain, pipelines) = single_pipeline(
single_middleware( single_middleware(

5
server/src/tiles.rs
View File

@ -38,12 +38,11 @@ pub fn get_tile(state: State) -> (State, Response<Body>) {
let bounds = te.to_rect(); let bounds = te.to_rect();
println!("get_tile@{} {:?}", zoom, bounds); println!("get_tile@{} {:?}", zoom, bounds);
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let result = { let result = app_state.with_db(|db|
let mut db = app_state.db.lock().unwrap();
db.query("SELECT geo, attrs FROM osm_ways WHERE box(polygon(pclose(geo))) && $1::box", &[ db.query("SELECT geo, attrs FROM osm_ways WHERE box(polygon(pclose(geo))) && $1::box", &[
&bounds.grow(1.2) &bounds.grow(1.2)
]).unwrap() ]).unwrap()
}; );
const TILE_SIZE: i32 = 256; const TILE_SIZE: i32 = 256;
let (w, h) = (TILE_SIZE, TILE_SIZE); let (w, h) = (TILE_SIZE, TILE_SIZE);

15
server/src/trees.rs
View File

@ -40,12 +40,11 @@ struct Tree {
pub fn get_trees(state: State) -> (State, Response<Body>) { pub fn get_trees(state: State) -> (State, Response<Body>) {
let pe = AreaExtractor::borrow_from(&state); let pe = AreaExtractor::borrow_from(&state);
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let result = { let result = app_state.with_db(|db| {
let mut db = app_state.db.lock().unwrap();
db.query("SELECT id, coord, botanic, german, planted FROM trees WHERE coord <@ $1::box ORDER BY coord <-> center($1::box) ASC LIMIT 2000", &[ db.query("SELECT id, coord, botanic, german, planted FROM trees WHERE coord <@ $1::box ORDER BY coord <-> center($1::box) ASC LIMIT 2000", &[
&pe.to_rect() &pe.to_rect()
]).unwrap() ]).unwrap()
}.into_iter().map(|row| { }).into_iter().map(|row| {
let point: Point<f64> = row.get(1); let point: Point<f64> = row.get(1);
Tree { Tree {
id: row.get(0), id: row.get(0),
@ -82,8 +81,7 @@ const PFAF_COLS: &[&str] = &[
pub fn get_tree(state: State) -> (State, Response<Body>) { pub fn get_tree(state: State) -> (State, Response<Body>) {
let ie = IdExtractor::borrow_from(&state); let ie = IdExtractor::borrow_from(&state);
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let result = { let result = app_state.with_db(|db| {
let mut db = app_state.db.lock().unwrap();
match db.query("SELECT id, coord, botanic, botanic_pfaf, german, planted FROM trees WHERE id=$1 LIMIT 1", &[&ie.id]).unwrap() match db.query("SELECT id, coord, botanic, botanic_pfaf, german, planted FROM trees WHERE id=$1 LIMIT 1", &[&ie.id]).unwrap()
.into_iter() .into_iter()
.next() { .next() {
@ -119,7 +117,7 @@ pub fn get_tree(state: State) -> (State, Response<Body>) {
}) })
} }
} }
}; });
let res = match result { let res = match result {
Some(result) => { Some(result) => {
@ -135,12 +133,11 @@ pub fn get_tree(state: State) -> (State, Response<Body>) {
pub fn get_heatmap(state: State) -> (State, Response<Body>) { pub fn get_heatmap(state: State) -> (State, Response<Body>) {
let rect = TileExtractor::borrow_from(&state).to_rect(); let rect = TileExtractor::borrow_from(&state).to_rect();
let app_state = AppState::borrow_from(&state); let app_state = AppState::borrow_from(&state);
let result = { let result = app_state.with_db(|db| {
let mut db = app_state.db.lock().unwrap();
db.query("SELECT coord, score, planted FROM trees WHERE coord <@ $1::box AND SCORE IS NOT NULL", &[ db.query("SELECT coord, score, planted FROM trees WHERE coord <@ $1::box AND SCORE IS NOT NULL", &[
&rect.grow(1.2) &rect.grow(1.2)
]).unwrap() ]).unwrap()
}; });
const TILE_SIZE: i32 = 256; const TILE_SIZE: i32 = 256;
let (w, h) = (TILE_SIZE, TILE_SIZE); let (w, h) = (TILE_SIZE, TILE_SIZE);