Skip to content

frontier: tighter integration with rust traits #469

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

Open
wants to merge 1 commit 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 timely/src/dataflow/operators/capability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ impl<T: Timestamp> CapabilitySet<T> {
/// let mut cap = CapabilitySet::from_elem(default_cap);
/// let mut vector = Vec::new();
/// move |input, output| {
/// cap.downgrade(&input.frontier().frontier());
/// cap.downgrade(&**input.frontier());
/// while let Some((time, data)) = input.next() {
/// data.swap(&mut vector);
/// }
Expand Down
4 changes: 2 additions & 2 deletions timely/src/dataflow/operators/generic/notificator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ impl<'a, T: Timestamp> Notificator<'a, T> {
}

/// Reveals the elements in the frontier of the indicated input.
pub fn frontier(&self, input: usize) -> AntichainRef<T> {
self.frontiers[input].frontier()
pub fn frontier(&self, input: usize) -> &AntichainRef<T> {
self.frontiers[input]
}

/// Requests a notification at the time associated with capability `cap`.
Expand Down
4 changes: 2 additions & 2 deletions timely/src/dataflow/operators/inspect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ impl<G: Scope, C: Container> InspectCore<G, C> for StreamCore<G, C> {
let mut frontier = crate::progress::Antichain::from_elem(G::Timestamp::minimum());
let mut vector = Default::default();
self.unary_frontier(Pipeline, "InspectBatch", move |_,_| move |input, output| {
if input.frontier.frontier() != frontier.borrow() {
if input.frontier != &frontier {
frontier.clear();
frontier.extend(input.frontier.frontier().iter().cloned());
frontier.extend(input.frontier.iter().cloned());
func(Err(frontier.elements()));
}
input.for_each(|time, data| {
Expand Down
4 changes: 2 additions & 2 deletions timely/src/dataflow/operators/probe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ impl<T: Timestamp> Handle<T> {
/// let frontier = handle.with_frontier(|frontier| frontier.to_vec());
/// ```
#[inline]
pub fn with_frontier<R, F: FnMut(AntichainRef<T>)->R>(&self, mut function: F) -> R {
function(self.frontier.borrow().frontier())
pub fn with_frontier<R, F: FnMut(&AntichainRef<T>)->R>(&self, mut function: F) -> R {
function(&self.frontier.borrow())
}
}

Expand Down
Loading