diff --git a/differential-dataflow/src/operators/int_proxy/history.rs b/differential-dataflow/src/operators/int_proxy/history.rs deleted file mode 100644 index 905614ac0..000000000 --- a/differential-dataflow/src/operators/int_proxy/history.rs +++ /dev/null @@ -1,5 +0,0 @@ -//! Time-ordered replay of proxy update histories, with meet-advancement. - -/// A value history suitable for integer proxy values. -pub(in crate::operators) type IdHistory = crate::operators::ValueHistory; - diff --git a/differential-dataflow/src/operators/int_proxy/join.rs b/differential-dataflow/src/operators/int_proxy/join.rs index 401cad3fe..61e19567e 100644 --- a/differential-dataflow/src/operators/int_proxy/join.rs +++ b/differential-dataflow/src/operators/int_proxy/join.rs @@ -15,7 +15,8 @@ use super::ProxyBridge; use crate::operators::join::{Fresh, JoinTactic}; use crate::operators::ValueHistory; -use super::history::IdHistory; +/// A value history suitable for integer proxy values. +type IdHistory = ValueHistory; /// A type that can interpret and retire pairs of lists of batches, joined by key hashes. /// diff --git a/differential-dataflow/src/operators/int_proxy/mod.rs b/differential-dataflow/src/operators/int_proxy/mod.rs index e247fc44a..536987be8 100644 --- a/differential-dataflow/src/operators/int_proxy/mod.rs +++ b/differential-dataflow/src/operators/int_proxy/mod.rs @@ -42,7 +42,6 @@ //! Both are welcome to efficiently notice that there have been no collisions and optimize, //! or to ignore the risk entirely and live dangerously. -mod history; pub mod join; pub mod reduce; diff --git a/differential-dataflow/src/operators/int_proxy/reduce.rs b/differential-dataflow/src/operators/int_proxy/reduce.rs index 736fcf817..23463372c 100644 --- a/differential-dataflow/src/operators/int_proxy/reduce.rs +++ b/differential-dataflow/src/operators/int_proxy/reduce.rs @@ -3,61 +3,11 @@ //! A conventional differential reduce against `(u64, u64)`, where the backend supplies the //! implementation of the interpretation of the integers. -use std::collections::BTreeMap; - -use timely::PartialOrder; -use timely::progress::{Antichain, Timestamp}; use timely::progress::frontier::AntichainRef; use crate::difference::Semigroup; -use crate::lattice::Lattice; use crate::trace::{BatchReader, Description}; use super::ProxyBridge; -use crate::operators::reduce::{sort_dedup, ReduceTactic}; -use crate::operators::ValueHistory; - -/// A unit of proxied reduce work, presented to the backend. -pub struct ReduceInstance<'a, B1: BatchReader, B2: BatchReader