Bump flatcontainer to 0.5 (#516)

Signed-off-by: Moritz Hoffmann <[email protected]>
TimelyDataflow · Jun 28, 2024 · 7998e65 · 7998e65
1 parent 9fac226
commit 7998e65
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/trace/implementations/ord_neu.rs b/src/trace/implementations/ord_neu.rs
@@ -10,7 +10,7 @@
 
 use std::rc::Rc;
 use timely::container::columnation::{TimelyStack};
-use timely::container::flatcontainer::{Containerized, FlatStack};
+use timely::container::flatcontainer::{FlatStack, RegionPreference};
 use timely::container::flatcontainer::impls::tuple::{TupleABCRegion, TupleABRegion};
 use crate::trace::implementations::chunker::{ColumnationChunker, ContainerChunker, VecChunker};
 
@@ -50,8 +50,8 @@ pub type FlatValSpine<L, R, C> = Spine<
 
 /// A trace implementation backed by flatcontainer storage, using [`FlatLayout`] as the layout.
 pub type FlatValSpineDefault<K, V, T, R, C> = FlatValSpine<
-    FlatLayout<<K as Containerized>::Region, <V as Containerized>::Region, <T as Containerized>::Region, <R as Containerized>::Region>,
-    TupleABCRegion<TupleABRegion<<K as Containerized>::Region, <V as Containerized>::Region>, <T as Containerized>::Region, <R as Containerized>::Region>,
+    FlatLayout<<K as RegionPreference>::Region, <V as RegionPreference>::Region, <T as RegionPreference>::Region, <R as RegionPreference>::Region>,
+    TupleABCRegion<TupleABRegion<<K as RegionPreference>::Region, <V as RegionPreference>::Region>, <T as RegionPreference>::Region, <R as RegionPreference>::Region>,
     C,
 >;
 
@@ -80,8 +80,8 @@ pub type FlatKeySpine<L, R, C> = Spine<
 
 /// A trace implementation backed by flatcontainer storage, using [`FlatLayout`] as the layout.
 pub type FlatKeySpineDefault<K,T,R, C> = FlatKeySpine<
-    FlatLayout<<K as Containerized>::Region, <() as Containerized>::Region, <T as Containerized>::Region, <R as Containerized>::Region>,
-    TupleABCRegion<TupleABRegion<<K as Containerized>::Region, <() as Containerized>::Region>, <T as Containerized>::Region, <R as Containerized>::Region>,
+    FlatLayout<<K as RegionPreference>::Region, <() as RegionPreference>::Region, <T as RegionPreference>::Region, <R as RegionPreference>::Region>,
+    TupleABCRegion<TupleABRegion<<K as RegionPreference>::Region, <() as RegionPreference>::Region>, <T as RegionPreference>::Region, <R as RegionPreference>::Region>,
     C,
 >;
 

diff --git a/tests/bfs.rs b/tests/bfs.rs
@@ -4,7 +4,7 @@ use rand::{Rng, SeedableRng, StdRng};
 use std::sync::{Arc, Mutex};
 
 use timely::{Config, PartialOrder};
-use timely::container::flatcontainer::{Containerized, MirrorRegion, Push, Region, ReserveItems};
+use timely::container::flatcontainer::{MirrorRegion, Push, Region, RegionPreference, ReserveItems};
 
 use timely::dataflow::*;
 use timely::dataflow::operators::Capture;
@@ -296,16 +296,16 @@ fn bfs_flat<G: Scope>(
     roots: &Collection<G, Node>,
 ) -> Collection<G, (Node, usize)>
 where
-    G::Timestamp: Lattice + Ord + Containerized,
-    for<'a> G::Timestamp: PartialOrder<<<G::Timestamp as Containerized>::Region as Region>::ReadItem<'a>>,
-    <G::Timestamp as Containerized>::Region: Region<Owned=G::Timestamp> + Push<G::Timestamp>,
-    for<'a> <Product<G::Timestamp, u64> as Containerized>::Region: Region<Owned=Product<G::Timestamp, u64>> + Push<<<Product<G::Timestamp, u64> as Containerized>::Region as Region>::ReadItem<'a>>,
-    <G::Timestamp as Containerized>::Region: Clone + Ord,
-    for<'a> FlatProductRegion<<G::Timestamp as Containerized>::Region, MirrorRegion<u64>>: Push<&'a Product<G::Timestamp, u64>>,
-    for<'a> <FlatProductRegion<<G::Timestamp as Containerized>::Region, MirrorRegion<u64>> as Region>::ReadItem<'a>: Copy + Ord + Debug,
-    Product<G::Timestamp, u64>: for<'a> PartialOrder<<<Product<G::Timestamp, u64> as Containerized>::Region as Region>::ReadItem<'a>>,
-    for<'a> <<Product<G::Timestamp, u64> as Containerized>::Region as Region>::ReadItem<'a>: PartialOrder<Product<G::Timestamp, u64>>,
-    for<'a> <Product<G::Timestamp, u64> as Containerized>::Region: ReserveItems<<<Product<G::Timestamp, u64> as Containerized>::Region as Region>::ReadItem<'a>>,
+    G::Timestamp: Lattice + Ord + RegionPreference,
+    for<'a> G::Timestamp: PartialOrder<<<G::Timestamp as RegionPreference>::Region as Region>::ReadItem<'a>>,
+    <G::Timestamp as RegionPreference>::Region: Region<Owned=G::Timestamp> + Push<G::Timestamp>,
+    for<'a> <Product<G::Timestamp, u64> as RegionPreference>::Region: Region<Owned=Product<G::Timestamp, u64>> + Push<<<Product<G::Timestamp, u64> as RegionPreference>::Region as Region>::ReadItem<'a>>,
+    <G::Timestamp as RegionPreference>::Region: Clone + Ord,
+    for<'a> FlatProductRegion<<G::Timestamp as RegionPreference>::Region, MirrorRegion<u64>>: Push<&'a Product<G::Timestamp, u64>>,
+    for<'a> <FlatProductRegion<<G::Timestamp as RegionPreference>::Region, MirrorRegion<u64>> as Region>::ReadItem<'a>: Copy + Ord + Debug,
+    Product<G::Timestamp, u64>: for<'a> PartialOrder<<<Product<G::Timestamp, u64> as RegionPreference>::Region as Region>::ReadItem<'a>>,
+    for<'a> <<Product<G::Timestamp, u64> as RegionPreference>::Region as Region>::ReadItem<'a>: PartialOrder<Product<G::Timestamp, u64>>,
+    for<'a> <Product<G::Timestamp, u64> as RegionPreference>::Region: ReserveItems<<<Product<G::Timestamp, u64> as RegionPreference>::Region as Region>::ReadItem<'a>>,
 {
     // initialize roots as reaching themselves at distance 0
     let nodes = roots.map(|x| (x, 0));