Skip to content

Commit

Permalink
Remove ContainerChunker input parameter
Browse files Browse the repository at this point in the history
Signed-off-by: Moritz Hoffmann <[email protected]>
  • Loading branch information
antiguru committed Jun 13, 2024
1 parent e279663 commit 08aeb54
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 5 additions & 10 deletions src/trace/implementations/chunker.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Organize streams of data into sorted chunks.

use std::collections::VecDeque;
use std::marker::PhantomData;
use timely::communication::message::RefOrMut;
use timely::Container;
use timely::container::columnation::{Columnation, TimelyStack};
Expand Down Expand Up @@ -270,17 +269,15 @@ where
}

/// Chunk a stream of vectors into chains of vectors.
pub struct ContainerChunker<Input, Output, Consolidator> {
pub struct ContainerChunker<Output, Consolidator> {
pending: Output,
empty: Output,
ready: VecDeque<Output>,
consolidator: Consolidator,
_marker: PhantomData<(Input, Consolidator)>,
}

impl<Input, Output, Consolidator> Default for ContainerChunker<Input, Output, Consolidator>
impl<Output, Consolidator> Default for ContainerChunker<Output, Consolidator>
where
Input: Default,
Output: Default,
Consolidator: Default,
{
Expand All @@ -290,12 +287,11 @@ where
empty: Output::default(),
ready: VecDeque::default(),
consolidator: Consolidator::default(),
_marker: PhantomData,
}
}
}

impl<'a, Input, Output, Consolidator> PushInto<RefOrMut<'a, Input>> for ContainerChunker<Input, Output, Consolidator>
impl<'a, Input, Output, Consolidator> PushInto<RefOrMut<'a, Input>> for ContainerChunker<Output, Consolidator>
where
Input: Container,
Output: SizableContainer + PushInto<Input::Item<'a>> + PushInto<Input::ItemRef<'a>>,
Expand Down Expand Up @@ -335,10 +331,9 @@ where
}
}

impl<Input, Output, Consolidator> ContainerBuilder for ContainerChunker<Input, Output, Consolidator>
impl<Output, Consolidator> ContainerBuilder for ContainerChunker<Output, Consolidator>
where
Input: Container,
for<'a> Output: SizableContainer + PushInto<Input::Item<'a>> + PushInto<Input::ItemRef<'a>>,
Output: SizableContainer,
Consolidator: ConsolidateContainer<Output> + Default + 'static,
{
type Container = Output;
Expand Down
2 changes: 0 additions & 2 deletions src/trace/implementations/ord_neu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ pub type FlatValSpine<K, V, T, R, C> = Spine<
MergeBatcher<
C,
ContainerChunker<
C,
FlatStack<<((K,V),T,R) as Containerized>::Region>,
ContainerConsolidator,
>,
Expand Down Expand Up @@ -79,7 +78,6 @@ pub type FlatKeySpine<K, T, R, C> = Spine<
MergeBatcher<
C,
ContainerChunker<
C,
FlatStack<<((K,()),T,R) as Containerized>::Region>,
ContainerConsolidator,
>,
Expand Down

0 comments on commit 08aeb54

Please sign in to comment.