Skip to content

Commit 0860d9c

Browse files
committed
Tidy some logging uses
1 parent 1521a40 commit 0860d9c

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

differential-dataflow/examples/bfs.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use differential_dataflow::input::Input;
77
use differential_dataflow::Collection;
88
use differential_dataflow::operators::*;
99
use differential_dataflow::lattice::Lattice;
10-
use differential_dataflow::logging::DifferentialEventBuilder;
1110

1211
type Node = u32;
1312
type Edge = (Node, Node);
@@ -23,22 +22,6 @@ fn main() {
2322
// define a new computational scope, in which to run BFS
2423
timely::execute_from_args(std::env::args(), move |worker| {
2524

26-
if let Ok(addr) = ::std::env::var("DIFFERENTIAL_LOG_ADDR") {
27-
28-
eprintln!("enabled DIFFERENTIAL logging to {}", addr);
29-
30-
if let Ok(stream) = ::std::net::TcpStream::connect(&addr) {
31-
let writer = ::timely::dataflow::operators::capture::EventWriter::new(stream);
32-
let mut logger = ::timely::logging::BatchLogger::new(writer);
33-
worker.log_register().unwrap().insert::<DifferentialEventBuilder,_>("differential/arrange", move |time, data|
34-
logger.publish_batch(time, data)
35-
);
36-
}
37-
else {
38-
panic!("Could not connect to differential log address: {:?}", addr);
39-
}
40-
}
41-
4225
let timer = ::std::time::Instant::now();
4326

4427
// define BFS dataflow; return handles to roots and edges inputs

differential-dataflow/examples/dynamic.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use differential_dataflow::input::Input;
77
use differential_dataflow::Collection;
88
use differential_dataflow::operators::*;
99
use differential_dataflow::lattice::Lattice;
10-
use differential_dataflow::logging::DifferentialEventBuilder;
1110

1211
type Node = u32;
1312
type Edge = (Node, Node);
@@ -23,22 +22,6 @@ fn main() {
2322
// define a new computational scope, in which to run BFS
2423
timely::execute_from_args(std::env::args(), move |worker| {
2524

26-
if let Ok(addr) = ::std::env::var("DIFFERENTIAL_LOG_ADDR") {
27-
28-
eprintln!("enabled DIFFERENTIAL logging to {}", addr);
29-
30-
if let Ok(stream) = ::std::net::TcpStream::connect(&addr) {
31-
let writer = ::timely::dataflow::operators::capture::EventWriter::new(stream);
32-
let mut logger = ::timely::logging::BatchLogger::new(writer);
33-
worker.log_register().unwrap().insert::<DifferentialEventBuilder,_>("differential/arrange", move |time, data|
34-
logger.publish_batch(time, data)
35-
);
36-
}
37-
else {
38-
panic!("Could not connect to differential log address: {:?}", addr);
39-
}
40-
}
41-
4225
let timer = ::std::time::Instant::now();
4326

4427
// define BFS dataflow; return handles to roots and edges inputs

differential-dataflow/src/operators/reduce.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ where
331331
let result_trace = &mut result_trace;
332332
trace.stream.unary_frontier(Pipeline, name, move |_capability, operator_info| {
333333

334+
// Acquire a logger for arrange events.
334335
let logger = trace.stream.scope().logger_for::<crate::logging::DifferentialEventBuilder>("differential/arrange").map(Into::into);
335336

336337
let activator = Some(trace.stream.scope().activator_for(operator_info.address.clone()));

0 commit comments

Comments
 (0)