Update Timely, Differential, Columnar (#31470)

antiguru · web-flow · commit 6ab6504024eb · 2025-02-13T13:47:17.000Z
The columnar crate had some breaking changes, which we're fixing as part of this change. ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design.  - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)).  - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post. --------- Signed-off-by: Moritz Hoffmann <mh@materialize.com>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/adapter-types/Cargo.toml b/src/adapter-types/Cargo.toml
@@ -15,7 +15,7 @@ mz-ore = { path = "../ore" }
 mz-repr = { path = "../repr" }
 mz-storage-types = { path = "../storage-types" }
 serde = "1.0.152"
-timely = "0.17.1"
+timely = "0.18.1"
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
 [package.metadata.cargo-udeps.ignore]
diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml
@@ -18,7 +18,7 @@ bytesize = "1.3.0"
 chrono = { version = "0.4.39", default-features = false, features = ["std"] }
 dec = "0.4.8"
 derivative = "2.2.0"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 enum-kinds = "0.5.1"
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures = "0.3.25"
@@ -81,7 +81,7 @@ serde_plain = "1.0.1"
 sha2 = "0.10.6"
 smallvec = { version = "1.10.0", features = ["union"] }
 static_assertions = "1.1"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = ["rt", "time"] }
 tokio-postgres = { version = "0.7.8" }
 tracing = "0.1.37"
diff --git a/src/catalog/Cargo.toml b/src/catalog/Cargo.toml
@@ -18,7 +18,7 @@ bytesize = "1.3.0"
 chrono = { version = "0.4.39", default-features = false, features = ["std"] }
 clap = { version = "4.5.23", features = ["derive"] }
 derivative = "2.2.0"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 ipnet = "2.11.0"
 itertools = "0.12.1"
@@ -60,7 +60,7 @@ serde_plain = "1.0.1"
 static_assertions = "1.1"
 sha2 = "0.10.6"
 thiserror = "1.0.37"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0" }
 tracing = "0.1.37"
 uuid = "1.2.2"
diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 anyhow = "1.0.95"
 async-trait = "0.1.83"
 crossbeam-channel = "0.5.14"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 mz-cluster-client = { path = "../cluster-client" }
 mz-ore = { path = "../ore", features = ["async", "process", "tracing_"] }
 mz-persist-client = { path = "../persist-client" }
 mz-service = { path = "../service" }
 mz-txn-wal = { path = "../txn-wal" }
 regex = "1.7.0"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "net"] }
 tracing = "0.1.37"
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml
@@ -15,7 +15,7 @@ async-trait = "0.1.83"
 bytesize = "1.3.0"
 crossbeam-channel = "0.5.14"
 derivative = "2.2.0"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 http = "1.1.0"
 mz-build-info = { path = "../build-info" }
@@ -43,7 +43,7 @@ prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.125"
 thiserror = "1.0.37"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = "1.38.0"
 tokio-stream = "0.1.11"
 tonic = "0.12.1"
diff --git a/src/compute-types/Cargo.toml b/src/compute-types/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 workspace = true
 
 [dependencies]
-columnar = "0.2.2"
+columnar = "0.3.0"
 columnation = "0.1.0"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 itertools = "0.12.1"
 mz-dyncfg = { path = "../dyncfg" }
 mz-expr = { path = "../expr" }
@@ -24,7 +24,7 @@ proptest = { version = "1.6.0", default-features = false, features = ["std"] }
 proptest-derive = { version = "0.5.1", features = ["boxed_union"] }
 prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 serde = { version = "1.0.152", features = ["derive"] }
-timely = "0.17.1"
+timely = "0.18.1"
 tracing = "0.1.37"
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml
@@ -13,11 +13,11 @@ workspace = true
 anyhow = "1.0.95"
 async-stream = "0.3.3"
 bytesize = "1.3.0"
-columnar = "0.2.2"
+columnar = "0.3.0"
 crossbeam-channel = "0.5.14"
 dec = { version = "0.4.8", features = ["serde"] }
-differential-dataflow = "0.13.5"
-differential-dogs3 = "0.1.5"
+differential-dataflow = "0.13.6"
+differential-dogs3 = "0.1.6"
 futures = "0.3.25"
 itertools = "0.12.1"
 lgalloc = "0.4"
@@ -40,7 +40,7 @@ prometheus = { version = "0.13.3", default-features = false }
 scopeguard = "1.1.0"
 serde = { version = "1.0.152", features = ["derive"] }
 smallvec = { version = "1.10.0", features = ["serde", "union"] }
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "net"] }
 tracing = "0.1.37"
 uuid = { version = "1.7.0", features = ["serde", "v4"] }
diff --git a/src/controller/Cargo.toml b/src/controller/Cargo.toml
@@ -32,7 +32,7 @@ mz-txn-wal = { path = "../txn-wal" }
 regex = "1.7.0"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.125"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = "1.38.0"
 tracing = "0.1.37"
 uuid = { version = "1.7.0" }
diff --git a/src/durable-cache/Cargo.toml b/src/durable-cache/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 [dependencies]
 async-trait = "0.1.83"
 bytes = { version = "1.3.0" }
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 itertools = { version = "0.12.1" }
 mz-ore = { path = "../ore", features = ["process"] }
@@ -23,7 +23,7 @@ mz-timely-util = { path = "../timely-util" }
 prometheus = { version = "0.13.3", default-features = false }
 prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", default-features = false, features = ["rt", "rt-multi-thread"] }
 tracing = "0.1.37"
 uuid = { version = "1.7.0", features = ["v4"] }
diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml
@@ -145,7 +145,7 @@ reqwest = { version = "0.11.13", features = ["blocking"] }
 serde_json = "1.0.125"
 serde_urlencoded = "0.7.1"
 similar-asserts = "1.4"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio-postgres = { version = "0.7.8", features = ["with-chrono-0_4"] }
 
 [build-dependencies]
diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml
@@ -59,7 +59,7 @@ serde_json = "1.0.125"
 sha1 = "0.10.5"
 sha2 = "0.10.6"
 subtle = "2.4.1"
-timely = "0.17.1"
+timely = "0.18.1"
 tracing = "0.1.37"
 uncased = "0.9.7"
 uuid = { version = "1.7.0", features = ["v5"] }
diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml
@@ -20,7 +20,7 @@ byteorder = "1.4.3"
 bytes = "1.3.0"
 chrono = { version = "0.4.39", default-features = false, features = ["std"] }
 clap = { version = "4.5.23", features = ["derive"] }
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 itertools = "0.12.1"
 maplit = "1.0.2"
 mz-avro = { path = "../avro", features = ["snappy"] }
@@ -33,7 +33,7 @@ prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 prost-reflect = "0.14.6"
 seahash = "4"
 serde_json = "1.0.125"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = ["macros", "net", "rt", "rt-multi-thread", "time"] }
 tracing = "0.1.37"
 uuid = { version = "1.7.0", features = ["serde"] }
diff --git a/src/persist-cli/Cargo.toml b/src/persist-cli/Cargo.toml
@@ -23,7 +23,7 @@ async-trait = "0.1.83"
 axum = "0.7.5"
 bytes = { version = "1.3.0", features = ["serde"] }
 clap = { version = "4.5.23", features = ["derive", "env"] }
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 humantime = "2.1.0"
 mz-http-util = { path = "../http-util" }
@@ -40,7 +40,7 @@ num_enum = "0.7.3"
 prometheus = { version = "0.13.3", default-features = false }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
 serde_json = "1.0.125"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", default-features = false, features = ["macros", "sync", "rt", "rt-multi-thread", "time"] }
 tracing = "0.1.37"
 url = "2.3.1"
diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml
@@ -35,7 +35,7 @@ async-stream = "0.3.3"
 async-trait = "0.1.83"
 bytes = { version = "1.3.0", features = ["serde"] }
 clap = { version = "4.5.23", features = ["derive"] }
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 futures-util = "0.3"
 h2 = "0.3.13"
@@ -59,7 +59,7 @@ sentry-tracing = "0.29.1"
 semver = { version = "1.0.16", features = ["serde"] }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
 serde_json = "1.0.125"
-timely = "0.17.1"
+timely = "0.18.1"
 thiserror = "1.0.37"
 tokio = { version = "1.38.0", default-features = false, features = ["macros", "sync", "rt", "rt-multi-thread", "time"] }
 tokio-metrics = "0.4.0"
diff --git a/src/persist-types/Cargo.toml b/src/persist-types/Cargo.toml
@@ -26,7 +26,7 @@ proptest-derive = { version = "0.5.1", features = ["boxed_union"] }
 prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.125" }
-timely = "0.17.1"
+timely = "0.18.1"
 tracing = "0.1.37"
 uuid = { version = "1.7.0", features = ["v4"] }
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
diff --git a/src/persist/Cargo.toml b/src/persist/Cargo.toml
@@ -37,7 +37,7 @@ azure_core = "0.21.0"
 base64 = "0.13.1"
 bytes = "1.3.0"
 deadpool-postgres = "0.10.3"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures-util = "0.3.25"
 md-5 = "0.10.5"
@@ -59,7 +59,7 @@ prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 rand = { version = "0.8.5", features = ["small_rng"] }
 reqwest = "0.12.4"
 serde = { version = "1.0.152", features = ["derive"] }
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", default-features = false, features = ["fs", "macros", "sync", "rt", "rt-multi-thread"] }
 tokio-postgres = { version = "0.7.8" }
 tracing = "0.1.37"
diff --git a/src/repr/Cargo.toml b/src/repr/Cargo.toml
@@ -31,12 +31,12 @@ arrow = { version = "53.3.0", default-features = false }
 bitflags = "1.3.2"
 bytes = "1.3.0"
 cfg-if = "1.0.0"
-columnar = "0.2.2"
+columnar = "0.3.0"
 columnation = "0.1.0"
 chrono = { version = "0.4.39", default-features = false, features = ["serde", "std"] }
 compact_bytes = "0.1.3"
 dec = "0.4.8"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 enum-kinds = "0.5.1"
 flatcontainer = "0.5.0"
 hex = "0.4.3"
@@ -68,7 +68,7 @@ serde_json = { version = "1.0.125", features = ["arbitrary_precision", "preserve
 smallvec = { version = "1.10.0", features = ["serde", "union"] }
 static_assertions = "1.1"
 strsim = "0.11.1"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio-postgres = { version = "0.7.8" }
 tracing-core = "0.1.30"
 url = { version = "2.3.1", features = ["serde"] }
diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml
@@ -35,7 +35,7 @@ prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 semver = "1.0.16"
 serde = { version = "1.0.152", features = ["derive"] }
 sysinfo = "0.29.11"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = "1.38.0"
 tokio-stream = "0.1.11"
 tonic = "0.12.1"
diff --git a/src/storage-client/Cargo.toml b/src/storage-client/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 anyhow = "1.0.95"
 async-trait = "0.1.83"
 chrono = { version = "0.4.39", default-features = false, features = ["std"] }
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 http = "1.1.0"
 itertools = { version = "0.12.1" }
@@ -46,7 +46,7 @@ serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.125" }
 smallvec = { version = "1.10.0", features = ["serde", "union"] }
 static_assertions = "1.1"
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = [
     "fs",
     "rt",
diff --git a/src/storage-controller/Cargo.toml b/src/storage-controller/Cargo.toml
@@ -15,7 +15,7 @@ async-trait = "0.1.83"
 bytes = "1.3.0"
 chrono = { version = "0.4.39", default-features = false, features = ["std"] }
 derivative = "2.2.0"
-differential-dataflow = "0.13.5"
+differential-dataflow = "0.13.6"
 futures = "0.3.25"
 itertools = { version = "0.12.1" }
 mz-build-info = { path = "../build-info" }
@@ -38,7 +38,7 @@ proptest = { version = "1.6.0", default-features = false, features = ["std"] }
 prost = { version = "0.13.4", features = ["no-recursion-limit"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.125" }
-timely = "0.17.1"
+timely = "0.18.1"
 tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "test-util", "time"] }
 tokio-postgres = { version = "0.7.8", features = ["serde"] }
 tokio-stream = "0.1.11"
diff --git a/src/storage-operators/Cargo.toml b/src/storage-operators/Cargo.toml
diff --git a/src/storage-types/Cargo.toml b/src/storage-types/Cargo.toml
diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
diff --git a/src/timely-util/Cargo.toml b/src/timely-util/Cargo.toml
diff --git a/src/timely-util/src/containers.rs b/src/timely-util/src/containers.rs
diff --git a/src/transform/Cargo.toml b/src/transform/Cargo.toml
diff --git a/src/txn-wal/Cargo.toml b/src/txn-wal/Cargo.toml
