Skip to content
Merged
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
24 changes: 1 addition & 23 deletions differential-dataflow/src/operators/arrange/arrangement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
use crate::{Data, VecCollection, AsCollection};
use crate::difference::Semigroup;
use crate::lattice::Lattice;
use crate::trace::{self, Trace, TraceReader, Navigable, Batcher, Builder, Cursor, BatchCursor, BatchDiff, BatchKey, BatchTimeGat, BatchVal, BatchValOwn};
use crate::trace::{self, Trace, TraceReader, Navigable, Batcher, Builder, Cursor, BatchCursor, BatchDiff, BatchKey, BatchVal, BatchValOwn};

use trace::wrappers::enter::{TraceEnter, BatchEnter,};
use trace::wrappers::enter_at::TraceEnter as TraceEnterAt;
use trace::wrappers::enter_at::BatchEnter as BatchEnterAt;

use super::TraceAgent;

Expand Down Expand Up @@ -92,26 +90,6 @@
}
}

/// Brings an arranged collection into a nested scope.
///
/// This method produces a proxy trace handle that uses the same backing data, but acts as if the timestamps
/// have all been extended with an additional coordinate with the default value. The resulting collection does
/// not vary with the new timestamp coordinate.
pub fn enter_at<'inner, TInner, F, P>(self, child: Scope<'inner, TInner>, logic: F, prior: P) -> Arranged<'inner, TraceEnterAt<Tr, TInner, F, P>>
where
Tr::Batch: Navigable,
TInner: Refines<Tr::Time>+Lattice+'static,
F: FnMut(BatchKey<'_, Tr>, BatchVal<'_, Tr>, BatchTimeGat<'_, Tr>)->TInner+Clone+'static,
P: FnMut(&TInner)->Tr::Time+Clone+'static,
{
let logic1 = logic.clone();
let logic2 = logic.clone();
Arranged {
trace: TraceEnterAt::make_from(self.trace, logic1, prior),
stream: self.stream.enter(child).map(move |bw| BatchEnterAt::make_from(bw, logic2.clone())),
}
}

/// Extracts a collection of any container from the stream of batches.
///
/// This method is like `self.stream.flat_map`, except that it produces containers
Expand Down Expand Up @@ -205,7 +183,7 @@
while let Some(key) = cursor.get_key(batch) {
while let Some(val) = cursor.get_val(batch) {
for datum in logic(key, val) {
cursor.map_times(batch, |time, diff| {

Check warning on line 186 in differential-dataflow/src/operators/arrange/arrangement.rs

View workflow job for this annotation

GitHub Actions / Cargo clippy

`time` shadows a previous, unrelated binding
session.give((datum.clone(), <BatchCursor<Tr> as Cursor>::owned_time(time), <BatchCursor<Tr> as Cursor>::owned_diff(diff)));
});
}
Expand Down
237 changes: 0 additions & 237 deletions differential-dataflow/src/trace/wrappers/enter_at.rs

This file was deleted.

1 change: 0 additions & 1 deletion differential-dataflow/src/trace/wrappers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//! Wrappers around trace implementations, providing derived views of updates.

pub mod enter;
pub mod enter_at;
pub mod frontier;
Loading