Skip to content
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.

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

Upgrade to timely and DD 0.12.0 #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion connect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ license = "MIT"
edition = "2018"

[dependencies]
timely = "^0.11"
timely = "^0.12.0"
4 changes: 2 additions & 2 deletions connect/src/receive/replaywithshutdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ where I : IntoIterator,
// The first thing we do is modify our capabilities to match the number of streams we manage.
// This should be a simple change of `self.event_streams.len() - 1`. We only do this once, as
// our very first action.
progress.internals[0].update(Default::default(), (event_streams.len() as i64) - 1);
antichain.update_iter(Some((Default::default(), (event_streams.len() as i64) - 1)).into_iter());
progress.internals[0].update(T::minimum(), (event_streams.len() as i64) - 1);
antichain.update_iter(Some((T::minimum(), (event_streams.len() as i64) - 1)).into_iter());
started = true;
}

Expand Down
4 changes: 2 additions & 2 deletions tdiag/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ license = "MIT"
edition = "2018"

[dependencies]
timely = "^0.11"
differential-dataflow = "^0.11"
timely = "^0.12.0"
differential-dataflow = "^0.12.0"
clap = "^2.33"
# tdiag-connect = "^0.2"
tdiag-connect = { path = "../connect" }
2 changes: 1 addition & 1 deletion tdiag/src/commands/arrangements.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use tdiag_connect::receive::ReplayWithShutdown;
/// compaction events and derive number of tuples for each trace;
/// 3. prints the current size alongside arrangement names;
pub fn listen(
timely_configuration: timely::Configuration,
timely_configuration: timely::Config,
timely_sockets: Vec<Option<std::net::TcpStream>>,
differential_sockets: Vec<Option<std::net::TcpStream>>,
output_interval_ms: u64,
Expand Down
2 changes: 1 addition & 1 deletion tdiag/src/commands/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static GRAPH_HTML: &str = include_str!("graph/dataflow-graph.html");
///
/// This module includes `graph/dataflow-graph.html` as a static resource.
pub fn listen_and_render(
timely_configuration: timely::Configuration,
timely_configuration: timely::Config,
sockets: Vec<Option<std::net::TcpStream>>,
output_path: &std::path::Path) -> Result<(), crate::DiagError> {

Expand Down
5 changes: 3 additions & 2 deletions tdiag/src/commands/profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use differential_dataflow::operators::{Join, reduce::Threshold, Consolidate, arr
use timely::logging::TimelyEvent::{Operates, Schedule};

use tdiag_connect::receive::ReplayWithShutdown;
use timely::progress::frontier::AntichainRef;

/// Prints aggregate time spent in each scope/operator.
///
Expand All @@ -24,7 +25,7 @@ use tdiag_connect::receive::ReplayWithShutdown;
/// 3. prints the resulting measurements alongside operator names and
/// scope names;
pub fn listen_and_profile(
timely_configuration: timely::Configuration,
timely_configuration: timely::Config,
sockets: Vec<Option<std::net::TcpStream>>) -> Result<(), crate::DiagError> {

let sockets = Arc::new(Mutex::new(sockets));
Expand Down Expand Up @@ -119,7 +120,7 @@ pub fn listen_and_profile(

let mut profile_trace = profile_trace;

profile_trace.distinguish_since(&[]);
profile_trace.set_physical_compaction(AntichainRef::new(&[]));

let (mut cursor, storage) = profile_trace.cursor();

Expand Down
4 changes: 2 additions & 2 deletions tdiag/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ variable pointing to tdiag's differential port (51318 by default).
.parse().map_err(|e| DiagError(format!("Invalid --diag-workers: {}", e)))?;

let timely_configuration = match diag_workers {
1 => timely::Configuration::Thread,
n => timely::Configuration::Process(n),
1 => timely::Config::thread(),
n => timely::Config::process(n),
};

match args.subcommand() {
Expand Down