Skip to content

Commit 56568ff

Browse files
Update to track timely 0.28 and columnar 0.12 (#698)
1 parent a821c72 commit 56568ff

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ rust-version = "1.86"
2323

2424
[workspace.dependencies]
2525
differential-dataflow = { path = "differential-dataflow", default-features = false, version = "0.20.0" }
26-
timely = { version = "0.27", default-features = false }
27-
columnar = { version = "0.11", default-features = false }
26+
timely = { version = "0.28", default-features = false }
27+
columnar = { version = "0.12", default-features = false }
2828
#timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
2929
#timely = { path = "../timely-dataflow/timely/", default-features = false }
3030

differential-dataflow/src/input.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ impl<T: Timestamp+Clone, D: Data, R: Semigroup+'static> InputSession<T, D, R> {
258258
/// called, all buffers are flushed and timely dataflow is advised that some logical times are no longer possible.
259259
pub fn flush(&mut self) {
260260
self.handle.send_batch(&mut self.buffer);
261-
if self.handle.epoch().less_than(&self.time) {
261+
if self.handle.time().less_than(&self.time) {
262262
self.handle.advance_to(self.time.clone());
263263
}
264264
}
@@ -269,7 +269,7 @@ impl<T: Timestamp+Clone, D: Data, R: Semigroup+'static> InputSession<T, D, R> {
269269
/// the session is dropped or flushed. It is not correct to use this time as a basis for a computation's `step_while`
270270
/// method unless the session has just been flushed.
271271
pub fn advance_to(&mut self, time: T) {
272-
assert!(self.handle.epoch().less_equal(&time));
272+
assert!(self.handle.time().less_equal(&time));
273273
assert!(&self.time.less_equal(&time));
274274
self.time = time;
275275
}

differential-dataflow/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
//!
5454
//! ```ignore
5555
//! loop {
56-
//! let time = input.epoch();
56+
//! let time = input.time();
5757
//! for round in time .. time + 100 {
5858
//! input.advance_to(round);
5959
//! input.insert((round % 13, round % 7));

0 commit comments

Comments
 (0)