Skip to content

Commit

Permalink
Update to recent Timely and Differential (#22384)
Browse files Browse the repository at this point in the history
Update Timely and Differential dependencies.

Most of the changes come from
TimelyDataflow/differential-dataflow#544.

<!--
Describe the contents of the PR briefly but completely.

If you write detailed commit messages, it is acceptable to copy/paste
them
here, or write "see commit messages for details." If there is only one
commit
in the PR, GitHub will have already added its commit message above.
-->

### Motivation

<!--
Which of the following best describes the motivation behind this PR?

  * This PR fixes a recognized bug.

    [Ensure issue is linked somewhere.]

  * This PR adds a known-desirable feature.

    [Ensure issue is linked somewhere.]

  * This PR fixes a previously unreported bug.

    [Describe the bug in detail, as if you were filing a bug report.]

  * This PR adds a feature that has not yet been specified.

[Write a brief specification for the feature, including justification
for its inclusion in Materialize, as if you were writing the original
     feature specification.]

   * This PR refactors existing code.

[Describe what was wrong with the existing code, if it is not obvious.]
-->

### Tips for reviewer

<!--
Leave some tips for your reviewer, like:

    * The diff is much smaller if viewed with whitespace hidden.
    * [Some function/module/file] deserves extra attention.
* [Some function/module/file] is pure code movement and only needs a
skim.

Delete this section if no tips.
-->

### Checklist

- [ ] This PR has adequate test coverage / QA involvement has been duly
considered.
- [ ] 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.
  <!-- Reference the design in the description. -->
- [ ] 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)).
<!-- Ask in #team-cloud on Slack if you need help preparing the cloud
PR. -->
- [ ] This PR includes the following [user-facing behavior
changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note):
- <!-- Add release notes here or explicitly state that there are no
user-facing behavior changes. -->

Signed-off-by: Moritz Hoffmann <[email protected]>
  • Loading branch information
antiguru authored Dec 20, 2024
1 parent dcee7f5 commit 6dd6807
Show file tree
Hide file tree
Showing 55 changed files with 977 additions and 712 deletions.
83 changes: 70 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/adapter-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mz-ore = { path = "../ore" }
mz-repr = { path = "../repr" }
mz-storage-types = { path = "../storage-types" }
serde = "1.0.152"
timely = "0.14.1"
timely = "0.15.1"
workspace-hack = { version = "0.0.0", path = "../workspace-hack" }

[package.metadata.cargo-udeps.ignore]
Expand Down
4 changes: 2 additions & 2 deletions src/adapter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ chrono = { version = "0.4.35", default-features = false, features = ["std"] }
dec = "0.4.8"
deadpool-postgres = "0.10.3"
derivative = "2.2.0"
differential-dataflow = "0.13.1"
differential-dataflow = "0.13.2"
enum-kinds = "0.5.1"
fail = { version = "0.5.1", features = ["failpoints"] }
futures = "0.3.25"
Expand Down Expand Up @@ -95,7 +95,7 @@ serde_plain = "1.0.1"
sha2 = "0.10.6"
smallvec = { version = "1.10.0", features = ["union"] }
static_assertions = "1.1"
timely = "0.14.1"
timely = "0.15.1"
tokio = { version = "1.38.0", features = ["rt", "time"] }
tokio-postgres = { version = "0.7.8" }
tokio-stream = "0.1.11"
Expand Down
4 changes: 2 additions & 2 deletions src/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bytesize = "1.1.0"
chrono = { version = "0.4.35", default-features = false, features = ["std"] }
clap = { version = "3.2.24", features = ["derive"] }
derivative = "2.2.0"
differential-dataflow = "0.13.1"
differential-dataflow = "0.13.2"
fail = { version = "0.5.1", features = ["failpoints"] }
futures = "0.3.25"
ipnet = "2.5.0"
Expand Down Expand Up @@ -65,7 +65,7 @@ smallvec = { version = "1.10.0", features = ["union"] }
static_assertions = "1.1"
sha2 = "0.10.6"
thiserror = "1.0.37"
timely = "0.14.1"
timely = "0.15.1"
tokio = { version = "1.38.0" }
tracing = "0.1.37"
uuid = "1.2.2"
Expand Down
4 changes: 2 additions & 2 deletions src/cluster/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bytesize = "1.1.0"
clap = { version = "3.2.24", features = ["derive", "env"] }
crossbeam-channel = "0.5.8"
dec = { version = "0.4.8", features = ["serde"] }
differential-dataflow = "0.13.1"
differential-dataflow = "0.13.2"
futures = "0.3.25"
mz-build-info = { path = "../build-info" }
mz-cluster-client = { path = "../cluster-client" }
Expand All @@ -33,7 +33,7 @@ rocksdb = { version = "0.22.0", default-features = false, features = ["snappy",
scopeguard = "1.1.0"
serde = { version = "1.0.152", features = ["derive"] }
smallvec = { version = "1.10.0", features = ["serde", "union"] }
timely = "0.14.1"
timely = "0.15.1"
tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "net"] }
tracing = "0.1.37"
uuid = { version = "1.7.0", features = ["serde", "v4"] }
Expand Down
1 change: 0 additions & 1 deletion src/clusterd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ mz-storage-client = { path = "../storage-client" }
mz-storage-types = { path = "../storage-types" }
mz-timely-util = { path = "../timely-util" }
mz-txn-wal = { path = "../txn-wal" }
timely = "0.14.1"
tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "test-util"] }
tower = "0.4.13"
tracing = "0.1.37"
Expand Down
4 changes: 2 additions & 2 deletions src/compute-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bytes = "1.3.0"
bytesize = "1.1.0"
chrono = { version = "0.4.35", default-features = false, features = ["std"] }
crossbeam-channel = "0.5.8"
differential-dataflow = "0.13.1"
differential-dataflow = "0.13.2"
futures = "0.3.25"
http = "1.1.0"
mz-build-info = { path = "../build-info" }
Expand Down Expand Up @@ -47,7 +47,7 @@ regex = "1.7.0"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.125"
thiserror = "1.0.37"
timely = "0.14.1"
timely = "0.15.1"
tokio = "1.38.0"
tokio-stream = "0.1.11"
tonic = "0.12.1"
Expand Down
4 changes: 2 additions & 2 deletions src/compute-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true

[dependencies]
columnation = "0.1.0"
differential-dataflow = "0.13.1"
differential-dataflow = "0.13.2"
itertools = "0.10.5"
mz-dyncfg = { path = "../dyncfg" }
mz-expr = { path = "../expr" }
Expand All @@ -23,7 +23,7 @@ proptest = { version = "1.6.0", default-features = false, features = ["std"] }
proptest-derive = { version = "0.5.1", features = ["boxed_union"] }
prost = { version = "0.13.2", features = ["no-recursion-limit"] }
serde = { version = "1.0.152", features = ["derive"] }
timely = "0.14.1"
timely = "0.15.1"
tracing = "0.1.37"
workspace-hack = { version = "0.0.0", path = "../workspace-hack" }

Expand Down
6 changes: 3 additions & 3 deletions src/compute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ bytesize = "1.1.0"
clap = { version = "3.2.24", features = ["derive", "env"] }
crossbeam-channel = "0.5.8"
dec = { version = "0.4.8", features = ["serde"] }
differential-dataflow = "0.13.1"
differential-dogs3 = "0.1.1"
differential-dataflow = "0.13.2"
differential-dogs3 = "0.1.2"
futures = "0.3.25"
itertools = "0.10.5"
lgalloc = "0.4"
Expand All @@ -43,7 +43,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.14.1"
timely = "0.15.1"
tokio = { version = "1.38.0", features = ["fs", "rt", "sync", "net"] }
tracing = "0.1.37"
uuid = { version = "1.7.0", features = ["serde", "v4"] }
Expand Down
Loading

0 comments on commit 6dd6807

Please sign in to comment.