Skip to content

erl: use rendezvous channels for append #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2022
Merged

erl: use rendezvous channels for append #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5211b
erl: use `flume`
alissa-tung Oct 9, 2022
7f1fc38
fix: hakari
alissa-tung Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/utils/workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ publish = false
### BEGIN HAKARI SECTION
[dependencies]
bytes = { version = "1", features = ["std"] }
getrandom = { version = "0.2", default-features = false, features = ["js", "js-sys", "rdrand", "std", "wasm-bindgen"] }
indexmap = { version = "1", default-features = false, features = ["std"] }
log = { version = "0.4", default-features = false, features = ["std"] }
prost = { version = "0.11", features = ["prost-derive", "std"] }
Expand Down
1 change: 1 addition & 0 deletions src/x/hstreamdb-erl-nifs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ hstreamdb = { path = "../../hstreamdb" }
log = "0.4.17"
env_logger = "0.9.0"

flume = "0.10.14"
once_cell = "1.14.0"
parking_lot = "0.12.1"
rustler = "0.26.0"
Expand Down
18 changes: 8 additions & 10 deletions src/x/hstreamdb-erl-nifs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use once_cell::sync::OnceCell;
use parking_lot::{Mutex, MutexGuard};
use rustler::types::atom::{error, ok};
use rustler::{resource, Atom, Encoder, Env, LocalPid, NifResult, OwnedEnv, ResourceArc, Term};
use tokio::sync::mpsc::channel;
use tokio::sync::oneshot;

mod runtime;
Expand Down Expand Up @@ -43,9 +42,7 @@ struct AppendResultFuture(Mutex<Option<AppendResultType>>, OnceCell<AppendResult

type AppendResultType = oneshot::Receiver<Result<RecordId, Arc<hstreamdb::Error>>>;
#[derive(Clone)]
pub struct NifAppender(
tokio::sync::mpsc::Sender<Option<(Record, oneshot::Sender<AppendResultType>)>>,
);
pub struct NifAppender(flume::Sender<Option<(Record, oneshot::Sender<AppendResultType>)>>);

fn load(env: Env, _: Term) -> bool {
resource!(NifAppender, env);
Expand Down Expand Up @@ -115,7 +112,7 @@ pub fn try_start_producer(
) -> hstreamdb::Result<ResourceArc<NifAppender>> {
let (sender, receiver) = oneshot::channel();
let (request_sender, request_receiver) =
channel::<Option<(Record, oneshot::Sender<AppendResultType>)>>(1);
flume::bounded::<Option<(Record, oneshot::Sender<AppendResultType>)>>(0);
let ProducerSettings {
compression_type,
concurrency_limit,
Expand Down Expand Up @@ -144,17 +141,18 @@ pub fn try_start_producer(
.await?;

_ = tokio::spawn(async move {
let mut request_receiver = request_receiver;
let request_receiver = request_receiver;
let mut appender = appender;
while let Some(record) = request_receiver.recv().await {
while let Ok(record) = request_receiver.recv_async().await {
match record {
Some((record, result_sender)) => {
let result_receiver = appender.append(record).await.unwrap();
result_sender.send(result_receiver).unwrap()
}
None => request_receiver.close(),
None => break,
}
}
drop(request_receiver)
});
_ = tokio::spawn(async move { producer.start().await });
Ok::<(), hstreamdb::Error>(())
Expand Down Expand Up @@ -185,7 +183,7 @@ pub fn start_producer<'a>(
#[rustler::nif]
fn stop_producer(producer: ResourceArc<NifAppender>) -> Atom {
let producer = &producer.0;
producer.blocking_send(None).unwrap_or(());
producer.send(None).unwrap_or(());
ok()
}

Expand All @@ -201,7 +199,7 @@ fn append(
};
let producer = &producer.0;
let (sender, receiver) = oneshot::channel();
producer.blocking_send(Some((record, sender))).unwrap();
producer.send(Some((record, sender))).unwrap();
let receiver = receiver.blocking_recv().unwrap();
ResourceArc::new(AppendResultFuture(
Mutex::new(Some(receiver)),
Expand Down