Browse Source

Fix check errors

tags/v0.2.0-candidate
Philipp Oppermann 2 years ago
parent
commit
7fdbca12c6
Failed to extract signature
5 changed files with 28 additions and 19 deletions
  1. +24
    -15
      apis/c++/operator/src/lib.rs
  2. +1
    -1
      examples/benchmark/run.rs
  3. +1
    -1
      examples/c++-dataflow/run.rs
  4. +1
    -1
      examples/c-dataflow/run.rs
  5. +1
    -1
      examples/rust-dataflow-url/run.rs

+ 24
- 15
apis/c++/operator/src/lib.rs View File

@@ -1,7 +1,9 @@
#![cfg(not(test))]
#![warn(unsafe_op_in_unsafe_fn)]

use dora_operator_api::{self, register_operator, DoraOperator, DoraOutputSender, DoraStatus};
use dora_operator_api::{
self, register_operator, DoraOperator, DoraOutputSender, DoraStatus, Event,
};
use ffi::DoraSendOutputResult;

#[cxx::bridge]
@@ -64,23 +66,30 @@ impl Default for OperatorWrapper {
}

impl DoraOperator for OperatorWrapper {
fn on_input(
fn on_event(
&mut self,
id: &str,
data: &[u8],
event: &Event,
output_sender: &mut DoraOutputSender,
) -> Result<DoraStatus, std::string::String> {
let operator = self.operator.as_mut().unwrap();
let mut output_sender = OutputSender(output_sender);

let result = ffi::on_input(operator, id, data, &mut output_sender);
if result.error.is_empty() {
Ok(match result.stop {
false => DoraStatus::Continue,
true => DoraStatus::Stop,
})
} else {
Err(result.error)
match event {
Event::Input { id, data } => {
let operator = self.operator.as_mut().unwrap();
let mut output_sender = OutputSender(output_sender);

let result = ffi::on_input(operator, id, data, &mut output_sender);
if result.error.is_empty() {
Ok(match result.stop {
false => DoraStatus::Continue,
true => DoraStatus::Stop,
})
} else {
Err(result.error)
}
}
_ => {
// ignore other events for now
Ok(DoraStatus::Continue)
}
}
}
}

+ 1
- 1
examples/benchmark/run.rs View File

@@ -14,7 +14,7 @@ async fn main() -> eyre::Result<()> {
let dataflow = Path::new("dataflow.yml");
build_dataflow(dataflow).await?;

dora_daemon::Daemon::run_dataflow(dataflow).await?;
dora_daemon::Daemon::run_dataflow(dataflow, None).await?;

Ok(())
}


+ 1
- 1
examples/c++-dataflow/run.rs View File

@@ -88,7 +88,7 @@ async fn main() -> eyre::Result<()> {
// build_package("dora-runtime").await?;

let dataflow = Path::new("dataflow.yml").to_owned();
dora_daemon::Daemon::run_dataflow(&dataflow).await?;
dora_daemon::Daemon::run_dataflow(&dataflow, None).await?;

Ok(())
}


+ 1
- 1
examples/c-dataflow/run.rs View File

@@ -18,7 +18,7 @@ async fn main() -> eyre::Result<()> {
build_c_node(root, "sink.c", "c_sink").await?;

let dataflow = Path::new("dataflow.yml").to_owned();
dora_daemon::Daemon::run_dataflow(&dataflow).await?;
dora_daemon::Daemon::run_dataflow(&dataflow, None).await?;

Ok(())
}


+ 1
- 1
examples/rust-dataflow-url/run.rs View File

@@ -10,7 +10,7 @@ async fn main() -> eyre::Result<()> {
let dataflow = Path::new("dataflow.yml");
build_dataflow(dataflow).await?;

dora_daemon::Daemon::run_dataflow(dataflow).await?;
dora_daemon::Daemon::run_dataflow(dataflow, None).await?;

Ok(())
}


Loading…
Cancel
Save