First cut at neu key-only spine

frankmcsherry · Nov 30, 2023 · 0349e37 · 0349e37
1 parent 3182200
commit 0349e37
Show file tree

Hide file tree

Showing 4 changed files with 457 additions and 11 deletions.
diff --git a/examples/spines.rs b/examples/spines.rs
@@ -31,14 +31,14 @@ fn main() {
 
             match mode.as_str() {
                 "new" => {
-                    use differential_dataflow::trace::implementations::ord::ColKeySpine;
+                    use differential_dataflow::trace::implementations::ord_neu::ColKeySpine;
                     let data = data.arrange::<ColKeySpine<_,_,_>>();
                     let keys = keys.arrange::<ColKeySpine<_,_,_>>();
                     keys.join_core(&data, |_k, &(), &()| Option::<()>::None)
                         .probe_with(&mut probe);
                 },
                 "old" => {
-                    use differential_dataflow::trace::implementations::ord::OrdKeySpine;
+                    use differential_dataflow::trace::implementations::ord_neu::OrdKeySpine;
                     let data = data.arrange::<OrdKeySpine<_,_,_>>();
                     let keys = keys.arrange::<OrdKeySpine<_,_,_>>();
                     keys.join_core(&data, |_k, &(), &()| Option::<()>::None)

diff --git a/src/trace/implementations/mod.rs b/src/trace/implementations/mod.rs
@@ -45,13 +45,13 @@ pub(crate) mod merge_batcher_col;
 
 pub use self::merge_batcher::MergeBatcher as Batcher;
 
-pub mod ord;
+// pub mod ord;
 pub mod ord_neu;
 pub mod rhh;
 
 // Opinionated takes on default spines.
-pub use self::ord::OrdValSpine as ValSpine;
-pub use self::ord::OrdKeySpine as KeySpine;
+pub use self::ord_neu::OrdValSpine as ValSpine;
+pub use self::ord_neu::OrdKeySpine as KeySpine;
 
 use std::borrow::{Borrow, ToOwned};