Skip to content

Commit

Permalink
Merge branch 'main' into sundy-li-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 20, 2022
2 parents df0bda9 + 063744c commit 6416bcc
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 30 deletions.
1 change: 0 additions & 1 deletion src/query/pipeline/core/src/processors/processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use futures::FutureExt;
use petgraph::graph::node_index;
use petgraph::prelude::NodeIndex;

#[derive(Debug)]
pub enum Event {
NeedData,
NeedConsume,
Expand Down
10 changes: 1 addition & 9 deletions src/query/service/src/pipelines/executor/executor_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,7 @@ impl ExecutingGraph {
state_guard_cache = Some(node.state.lock().unwrap());
}

let event = node.processor.event()?;
tracing::debug!(
"node id:{:?}, name:{:?}, event: {:?}",
node.processor.id(),
node.processor.name(),
event
);

let processor_state = match event {
let processor_state = match node.processor.event()? {
Event::Finished => State::Finished,
Event::NeedData | Event::NeedConsume => State::Idle,
Event::Sync => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use std::fmt::Debug;
use std::fmt::Formatter;
use std::sync::Arc;
use std::time::Instant;

use common_base::base::TrySpawn;
use common_exception::ErrorCode;
Expand Down Expand Up @@ -80,19 +79,7 @@ impl ExecutorWorkerContext {
}

unsafe fn execute_sync_task(&mut self, processor: ProcessorPtr) -> Result<Option<NodeIndex>> {
if tracing::enabled!(tracing::Level::DEBUG) {
let start = Instant::now();
processor.process()?;
tracing::debug!(
"sync processor, node id:{:?}, name:{:?}, event: {:?}",
processor.id(),
processor.name(),
start.elapsed()
);
} else {
processor.process()?;
}

processor.process()?;
Ok(Some(processor.id()))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ impl ProcessorAsyncTask {
);
}
Either::Right((res, _)) => {
tracing::debug!(
"async processor, node id {:?} name: {:?}, elapsed:{:?}",
wraning_processor.id(),
wraning_processor.name(),
start.elapsed()
);
return res;
}
}
Expand Down

0 comments on commit 6416bcc

Please sign in to comment.