Commit17d1199

authored

Lock antidote (#337)

1 parent491d7c3 commit17d1199Copy full SHA for 17d1199

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ rmp-serde = { version = "1.1.0" }`
`31`	`31`	`typetag ="0.2"`
`32`	`32`	`pyo3 = {version ="0.17",features = ["auto-initialize"] }`
`33`	`33`	`heapless ="0.7.13"`
	`34`	`+parking_lot ="0.12"`
`34`	`35`
`35`	`36`	`[dev-dependencies]`
`36`	`37`	`pgx-tests ="=0.4.5"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
	`1`	`+use parking_lot::Mutex;`
`1`	`2`	`use std::collections::HashMap;`
`2`	`3`	`use std::fmt::Write;`
`3`	`4`	`use std::str::FromStr;`
`4`		`-use std::sync::Mutex;`
`5`	`5`
`6`	`6`	`use once_cell::sync::Lazy;`
`7`	`7`	`use pgx::*;`
`@@ -244,7 +244,7 @@ fn deploy(`
`244`	`244`
`245`	`245`	`#[pg_extern]`
`246`	`246`	`fnpredict(project_name:&str,features:Vec<f32>) ->f32{`
`247`		`-letmut projects =PROJECT_NAME_TO_PROJECT_ID.lock().unwrap();`
	`247`	`+letmut projects =PROJECT_NAME_TO_PROJECT_ID.lock();`
`248`	`248`	`let project_id =match projects.get(project_name){`
`249`	`249`	`Some(project_id) =>*project_id,`
`250`	`250`	`None =>{`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use once_cell::sync::Lazy; // 1.3.1`
`6`	`6`	`use pgx::*;`
`7`	`7`	`use std::collections::HashMap;`
`8`	`8`	`use std::fs;`
`9`		`-usestd::sync::Mutex;`
	`9`	`+useparking_lot::Mutex;`
`10`	`10`	`use xgboost::{Booster,DMatrix};`
`11`	`11`
`12`	`12`	`pubmod api;`
`@@ -25,7 +25,7 @@ static MODELS: Lazy<Mutex<HashMap<i64, Vec<u8>>>> = Lazy::new(\|\| Mutex::new(Hash`
`25`	`25`
`26`	`26`	`#[pg_extern]`
`27`	`27`	`fnmodel_predict(model_id:i64,features:Vec<f32>) ->f32{`
`28`		`-letmut guard =MODELS.lock().unwrap();`
	`28`	`+letmut guard =MODELS.lock();`
`29`	`29`
`30`	`30`	`match guard.get(&model_id){`
`31`	`31`	`Some(data) =>{`
`@@ -59,7 +59,7 @@ fn model_predict(model_id: i64, features: Vec<f32>) -> f32 {`
`59`	`59`
`60`	`60`	`#[pg_extern]`
`61`	`61`	`fnmodel_predict_batch(model_id:i64,features:Vec<f32>,num_rows:i32) ->Vec<f32>{`
`62`		`-letmut guard =MODELS.lock().unwrap();`
	`62`	`+letmut guard =MODELS.lock();`
`63`	`63`
`64`	`64`	`if num_rows <0{`
`65`	`65`	`error!("Number of rows has to be greater than 0");`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use std::collections::HashMap;`
`2`	`2`	`use std::fmt::Debug;`
`3`	`3`	`use std::str::FromStr;`
`4`	`4`	`use std::sync::Arc;`
`5`		`-usestd::sync::Mutex;`
	`5`	`+useparking_lot::Mutex;`
`6`	`6`
`7`	`7`	`use ndarray::{Array1,Array2};`
`8`	`8`	`use once_cell::sync::Lazy;`
`@@ -26,7 +26,7 @@ static DEPLOYED_ESTIMATORS_BY_MODEL_ID: Lazy<Mutex<HashMap<i64, Arc<Box<dyn Esti`
`26`	`26`	`pubfnfind_deployed_estimator_by_model_id(model_id:i64) ->Arc<Box<dynEstimator>>{`
`27`	`27`	`// Get the estimator from process memory, if we already loaded it.`
`28`	`28`	`{`
`29`		`-let estimators =DEPLOYED_ESTIMATORS_BY_MODEL_ID.lock().unwrap();`
	`29`	`+let estimators =DEPLOYED_ESTIMATORS_BY_MODEL_ID.lock();`
`30`	`30`	`ifletSome(estimator) = estimators.get(&model_id){`
`31`	`31`	`return estimator.clone();`
`32`	`32`	`}`
`@@ -88,7 +88,7 @@ pub fn find_deployed_estimator_by_model_id(model_id: i64) -> Arc<Box<dyn Estimat`
`88`	`88`	`};`
`89`	`89`
`90`	`90`	`// Cache the estimator in process memory.`
`91`		`-letmut estimators =DEPLOYED_ESTIMATORS_BY_MODEL_ID.lock().unwrap();`
	`91`	`+letmut estimators =DEPLOYED_ESTIMATORS_BY_MODEL_ID.lock();`
`92`	`92`	`estimators.insert(model_id,Arc::new(estimator));`
`93`	`93`	`estimators.get(&model_id).unwrap().clone()`
`94`	`94`	`}`

Comments

(0)