Reintegrate changes with columnar builder PR

Signed-off-by: Moritz Hoffmann <[email protected]>

Author: antiguru

Cargo.toml

@@ -17,7 +17,8 @@ resolver = "2"
 
 [workspace.dependencies]
 differential-dataflow = { path = "differential-dataflow", default-features = false, version = "0.15.2" }
-timely = { version = "0.21", default-features = false }
+# timely = { version = "0.21", default-features = false }
+timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", branch = "master" }
 #timely = { path = "../timely-dataflow/timely/", default-features = false }
 
 [profile.release]

differential-dataflow/Cargo.toml

@@ -23,7 +23,8 @@ graph_map = "0.1"
 bytemuck = "1.18.0"
 
 [dependencies]
-columnar = "0.5"
+#columnar = "0.5"
+columnar = { git = "https://github.com/antiguru/columnar", branch = "reborrow" }
 columnation = "0.1.0"
 fnv="1.0.2"
 paste = "1.0"