itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-04-09 11:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

use futures_channel::oneshot in sqlite worker

Browse Source
This commit is contained in:
Marcin Kaźmierczak
2020-10-31 21:57:32 +01:00
committed by Austin Bonander
parent 6a5c54be70
commit 1d9ab5245c
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sqlx-core/src/sqlite/statement/worker.rs
View File

@@ -1,9 +1,9 @@
use crate::error::Error;
use crate::sqlite::statement::StatementHandle;
use crossbeam_channel::{bounded, unbounded, Sender};
use crossbeam_channel::{unbounded, Sender};
use either::Either;
use futures_channel::oneshot;
use libsqlite3_sys::{sqlite3_step, SQLITE_DONE, SQLITE_ROW};
use sqlx_rt::yield_now;
use std::thread;
// Each SQLite connection has a dedicated thread.
@@ -19,7 +19,7 @@ pub(crate) struct StatementWorker {
enum StatementWorkerCommand {
Step {
statement: StatementHandle,
tx: Sender<Result<Either<u64, ()>, Error>>,
tx: oneshot::Sender<Result<Either<u64, ()>, Error>>,
},
}
@@ -52,16 +52,12 @@ impl StatementWorker {
&mut self,
statement: StatementHandle,
) -> Result<Either<u64, ()>, Error> {
let (tx, rx) = bounded(1);
let (tx, rx) = oneshot::channel();
self.tx
.send(StatementWorkerCommand::Step { statement, tx })
.map_err(|_| Error::WorkerCrashed)?;
while rx.is_empty() {
yield_now().await;
}
rx.recv().map_err(|_| Error::WorkerCrashed)?
rx.await.map_err(|_| Error::WorkerCrashed)?
}
}