|
|
@@ -18,11 +18,15 @@ pub struct SledAsync {
|
|
18
|
18
|
}
|
|
19
|
19
|
|
|
20
|
20
|
impl SledAsync {
|
|
21
|
|
- pub fn new(path: &str) -> ResultType<Self> {
|
|
22
|
|
- Ok(Self {
|
|
|
21
|
+ pub fn new(path: &str, run: bool) -> ResultType<Self> {
|
|
|
22
|
+ let mut res = Self {
|
|
23
|
23
|
db: sled::open(path)?,
|
|
24
|
24
|
tx: None,
|
|
25
|
|
- })
|
|
|
25
|
+ };
|
|
|
26
|
+ if run {
|
|
|
27
|
+ res.run();
|
|
|
28
|
+ }
|
|
|
29
|
+ Ok(res)
|
|
26
|
30
|
}
|
|
27
|
31
|
|
|
28
|
32
|
pub fn run(&mut self) -> std::thread::JoinHandle<()> {
|
|
|
@@ -31,6 +35,7 @@ impl SledAsync {
|
|
31
|
35
|
let db = self.db.clone();
|
|
32
|
36
|
std::thread::spawn(move || {
|
|
33
|
37
|
Self::io_loop(db, rx);
|
|
|
38
|
+ log::debug!("Exit SledAsync loop");
|
|
34
|
39
|
})
|
|
35
|
40
|
}
|
|
36
|
41
|
|
|
|
@@ -55,6 +60,13 @@ impl SledAsync {
|
|
55
|
60
|
}
|
|
56
|
61
|
}
|
|
57
|
62
|
|
|
|
63
|
+ pub fn _close(self, j: std::thread::JoinHandle<()>) {
|
|
|
64
|
+ if let Some(tx) = &self.tx {
|
|
|
65
|
+ allow_err!(tx.send(Action::Close));
|
|
|
66
|
+ }
|
|
|
67
|
+ allow_err!(j.join());
|
|
|
68
|
+ }
|
|
|
69
|
+
|
|
58
|
70
|
pub async fn get(&mut self, key: String) -> Option<sled::IVec> {
|
|
59
|
71
|
if let Some(tx) = &self.tx {
|
|
60
|
72
|
let (tx_once, mut rx) = mpsc::channel::<Option<sled::IVec>>(1);
|
|
|
@@ -67,7 +79,7 @@ impl SledAsync {
|
|
67
|
79
|
}
|
|
68
|
80
|
|
|
69
|
81
|
#[inline]
|
|
70
|
|
- pub fn deserialize<'a, T: serde::Deserialize<'a>>(v: &'a Option<sled::IVec>) -> Option<T> {
|
|
|
82
|
+ pub fn _deserialize<'a, T: serde::Deserialize<'a>>(v: &'a Option<sled::IVec>) -> Option<T> {
|
|
71
|
83
|
if let Some(v) = v {
|
|
72
|
84
|
if let Ok(v) = std::str::from_utf8(v) {
|
|
73
|
85
|
if let Ok(v) = serde_json::from_str::<T>(&v) {
|
|
|
@@ -78,9 +90,9 @@ impl SledAsync {
|
|
78
|
90
|
None
|
|
79
|
91
|
}
|
|
80
|
92
|
|
|
81
|
|
- pub fn insert<'a, T: serde::Serialize>(&mut self, key: String, v: &T) {
|
|
|
93
|
+ pub fn insert<T: serde::Serialize>(&mut self, key: String, v: T) {
|
|
82
|
94
|
if let Some(tx) = &self.tx {
|
|
83
|
|
- if let Ok(v) = serde_json::to_vec(v) {
|
|
|
95
|
+ if let Ok(v) = serde_json::to_vec(&v) {
|
|
84
|
96
|
allow_err!(tx.send(Action::Insert((key, v))));
|
|
85
|
97
|
}
|
|
86
|
98
|
}
|