From e3a36c36d66624da0eccc2e1d0d495963a4954e6 Mon Sep 17 00:00:00 2001 From: Mingwei Samuel Date: Mon, 23 Dec 2024 12:40:47 -0800 Subject: [PATCH] chore: update links for renamed repo (excluding `CHANGELOG.md`s) --- .github/gh-pages/index.md | 2 +- .github/workflows/release.yml | 2 +- CITATION.cff | 2 +- CONTRIBUTING.md | 2 +- README.md | 6 +++--- RELEASING.md | 16 ++++++++-------- datastores/gossip_kv/cli/main.rs | 2 +- datastores/gossip_kv/kv/model.rs | 2 +- datastores/gossip_kv/kv/server.rs | 2 +- dfir_datalog/src/lib.rs | 2 +- dfir_lang/src/graph/flat_graph_builder.rs | 2 +- dfir_lang/src/graph/flat_to_partitioned.rs | 2 +- dfir_lang/src/graph/ops/anti_join.rs | 2 +- dfir_lang/src/graph/ops/anti_join_multiset.rs | 2 +- dfir_lang/src/graph/ops/fold_keyed.rs | 2 +- dfir_lang/src/graph/ops/multiset_delta.rs | 2 +- dfir_lang/src/graph/ops/persist_mut.rs | 2 +- dfir_lang/src/graph/ops/persist_mut_keyed.rs | 2 +- dfir_lang/src/graph/ops/reduce_keyed.rs | 2 +- dfir_macro/src/lib.rs | 6 +++--- dfir_rs/src/lib.rs | 2 +- dfir_rs/tests/surface_lattice_bimorphism.rs | 2 +- dfir_rs/tests/surface_lattice_join.rs | 2 +- docs/docs/dfir/architecture/index.mdx | 2 +- docs/docs/dfir/concepts/index.md | 2 +- docs/docs/dfir/ecosystem.md | 2 +- docs/docs/dfir/index.mdx | 2 +- .../dfir/quickstart/example_7_networking.mdx | 2 +- docs/docs/dfir/quickstart/setup.md | 14 +++++++------- docs/docs/hydro/index.mdx | 2 +- docs/docusaurus.config.js | 8 ++++---- docs/src/pages/playground.js | 4 ++-- template/dfir/Cargo.toml | 2 +- template/dfir/README.md | 4 ++-- 34 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/gh-pages/index.md b/.github/gh-pages/index.md index 17518baec96..6a361ab75aa 100644 --- a/.github/gh-pages/index.md +++ b/.github/gh-pages/index.md @@ -1,7 +1,7 @@ --- --- - [Main website (hydro.run) 🔗](https://hydro.run) -- [Github Repository 🔗](https://github.com/hydro-project/hydroflow) +- [Github Repository 🔗](https://github.com/hydro-project/hydro) - [Design Docs]({{ "/design_docs/" | prepend: site.github.url | replace: 'https://', '//' }}) - [Benchmark History]({{ "/bench/" | prepend: site.github.url | replace: 'https://', '//' }}) - [Latest Benchmarks]({{ "/criterion/report/" | prepend: site.github.url | replace: 'https://', '//' }}) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d465940d223..fbcdcdf38ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: # and tags to `main` in the normal way. Instead we have an app: # https://github.com/organizations/hydro-project/settings/apps/hydro-project-bot # Which is added the the users allowed to bypass branch protections: - # https://github.com/hydro-project/hydroflow/settings/branches + # https://github.com/hydro-project/hydro/settings/branches # We grab a token from the app using this action via the `APP_ID` ("App ID") and an # `APP_PRIVATE_KEY` ("Generate a private key"). - name: Generate token diff --git a/CITATION.cff b/CITATION.cff index 2d4464f1299..d46e642022d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -44,7 +44,7 @@ authors: family-names: Power orcid: 'https://orcid.org/0000-0002-0660-5110' affiliation: UC Berkeley -repository-code: 'https://github.com/hydro-project/hydroflow/' +repository-code: 'https://github.com/hydro-project/hydro/' url: 'https://hydro.run/' abstract: >- Hydro is a language stack for programming distributed systems, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6add204d32f..dd6c9ccab07 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -117,4 +117,4 @@ in the latest version of `clippy`. See [Setup#Rust](#rust) above. ## Releasing -See [`RELEASING.md`](https://github.com/hydro-project/hydroflow/blob/main/RELEASING.md). +See [`RELEASING.md`](https://github.com/hydro-project/hydro/blob/main/RELEASING.md). diff --git a/README.md b/README.md index e1c5850ec8d..7efcd2d2307 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- "hf" + "hf"

Crates.io @@ -18,9 +18,9 @@ We often describe Hydro via a metaphor: *LLVM for the cloud*. Like LLVM, Hydro i ## The Language (and the Low-Level IR) -Hydro provides a [high-level language](https://hydro.run/docs/hydro) that allows you to program an entire fleet of processes from a single program, and then launch your fleet locally or in the cloud via [Hydro Deploy](https://hydro.run/docs/deploy). Get started with Hydro via the language [documentation](https://hydro.run/docs/hydro) and [examples](https://github.com/hydro-project/hydroflow/tree/main/hydro_test/examples). +Hydro provides a [high-level language](https://hydro.run/docs/hydro) that allows you to program an entire fleet of processes from a single program, and then launch your fleet locally or in the cloud via [Hydro Deploy](https://hydro.run/docs/deploy). Get started with Hydro via the language [documentation](https://hydro.run/docs/hydro) and [examples](https://github.com/hydro-project/hydro/tree/main/hydro_test/examples). -> Internally, the Hydro stack compiles Hydro programs into a low-level Dataflow Internal Representation (IR) language called [DFIR](https://hydro.run/docs/dfir); each process corresponds to a separate DFIR program. In rare cases you may want to compose one or more processes in DFIR by hand; see the DFIR [documentation](https://hydro.run/docs/dfir) or [examples](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/examples) for details. +> Internally, the Hydro stack compiles Hydro programs into a low-level Dataflow Internal Representation (IR) language called [DFIR](https://hydro.run/docs/dfir); each process corresponds to a separate DFIR program. In rare cases you may want to compose one or more processes in DFIR by hand; see the DFIR [documentation](https://hydro.run/docs/dfir) or [examples](https://github.com/hydro-project/hydro/tree/main/dfir_rs/examples) for details. ## Development Setup diff --git a/RELEASING.md b/RELEASING.md index aa9300fd690..52a33970afa 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -4,7 +4,7 @@ This is a guide on how to create releases for all Hydro crates in this workspace We use the [`cargo-smart-release` crate](https://github.com/Byron/cargo-smart-release) for our release workflow. Originally, cargo-smart-release [was part of gitoxide](https://github.com/Byron/gitoxide/pull/998) -but it has since been separated into its own crate. We have our own [GitHub Action release workflow](https://github.com/hydro-project/hydroflow/actions/workflows/release.yml) +but it has since been separated into its own crate. We have our own [GitHub Action release workflow](https://github.com/hydro-project/hydro/actions/workflows/release.yml) ([action YAML here](.github/workflows/release.yml)) which is our intended way to create releases. @@ -42,7 +42,7 @@ cargo smart-release --update-crates-index \ package has changes but doesn't have the right commit messages then `cargo smart-release` will complain and give up. -To see if anything needs addressing, go to the [Release action](https://github.com/hydro-project/hydroflow/actions/workflows/release.yml) +To see if anything needs addressing, go to the [Release action](https://github.com/hydro-project/hydro/actions/workflows/release.yml) and click on the "Run workflow" button in the top right corner. Branch should be `main`, version bump should most likely be `patch`, `minor`, or `major`. Note that semantic versioning is: ```js @@ -88,20 +88,20 @@ need to do a bit of manual work. That looks like this in the log (check for this [WARN ] WOULD ask for review after commit as the changelog entry is empty for crates: dfir_datalog, dfir_macro ``` In this case, you will need to create a commit to each package's `CHANGELOG.md` to mark it as -unchanged (or minimally changed). For example, [hydro_cli 0.3](https://github.com/hydro-project/hydroflow/commit/4c2cf81411835529b5d7daa35717834e46e28b9b). +unchanged (or minimally changed). For example, [hydro_cli 0.3](https://github.com/hydro-project/hydro/commit/4c2cf81411835529b5d7daa35717834e46e28b9b). Once all changelogs are ok to autogenerate, we can move on to the real-deal run. ## Real-deal run -Again, go to the [Release action](https://github.com/hydro-project/hydroflow/actions/workflows/release.yml) +Again, go to the [Release action](https://github.com/hydro-project/hydro/actions/workflows/release.yml) and click on the "Run workflow" button in the top right corner. Select branch `main`, version bump as needed and this time _check_ the "Actually execute and publish the release?" box. Hopefully all goes well and the release will appear on the other end. If the release fails it may leave the repo in a bit of a half-broken or half-released state. Some or all of the release verison tags may be pushed. You may need to manually create some -[GitHub releases](https://github.com/hydro-project/hydroflow/releases). +[GitHub releases](https://github.com/hydro-project/hydro/releases). You can also try re-running the release action but with the version bump set to `keep`, if versions have been bumped but not released. You'll have to figure it out, its finicky. @@ -124,7 +124,7 @@ When adding a new crate which is published, you need to: 3. You must commit a new (empty) file `my_crate/CHANGELOG.md` to ensure the file will be tracked by git and pushed by `cargo-smart-release` 4. If you want your package to be lockstep-versioned alongside hydro then make sure to add it - to the [command in the `release.yml` workflow](https://github.com/hydro-project/hydroflow/blob/main/.github/workflows/release.yml#L82). + to the [command in the `release.yml` workflow](https://github.com/hydro-project/hydro/blob/main/.github/workflows/release.yml#L82). (also update the `cargo smart-release` test command above in this file). Then just run the release workflow as normal. @@ -194,7 +194,7 @@ section in order to work around this issue. ## Addendum: The GitHub App account -So... `cargo smart-release` wants to push to `hydro-project/hydroflow`'s `main` branch. However, +So... `cargo smart-release` wants to push to `hydro-project/hydro`'s `main` branch. However, branch protection says you can only push to main via a pull request, and for some reason that branch protection also applies to GitHub Actions. @@ -203,7 +203,7 @@ Basically it is a pretty unremarkable unpublished GitHub App with permissions to It has some sort of secret which lets us act as the app within GitHub actions, which is passed through via `secrets.APP_PRIVATE_KEY`. (I guess this is the "Client secrets" secret, but for some reason that says "Never used"? I don't remember). Importantly, we have also given the Hydro Project -Bot permission to bypass [`main` branch protection rules](https://github.com/hydro-project/hydroflow/settings/branch_protection_rules/24797446), +Bot permission to bypass [`main` branch protection rules](https://github.com/hydro-project/hydro/settings/branch_protection_rules/24797446), under "Allow specified actors to bypass required pull requests" and also under "Allow force pushes" (although I don't think that `cargo smart-release` does force pushes?). diff --git a/datastores/gossip_kv/cli/main.rs b/datastores/gossip_kv/cli/main.rs index d008387b900..8b5b0e2a879 100644 --- a/datastores/gossip_kv/cli/main.rs +++ b/datastores/gossip_kv/cli/main.rs @@ -111,7 +111,7 @@ async fn main() { commands[Get] -> map(|(key,)| (ClientRequest::Get {key}, server_address)) -> outbound_messages; commands[Set] -> map(|(key, value)| (ClientRequest::Set {key, value}, server_address)) -> outbound_messages; commands[Delete] -> map(|(key,)| (ClientRequest::Delete {key}, server_address)) -> outbound_messages; - commands[Exit] -> for_each(|()| std::process::exit(0)); // TODO: Graceful shutdown https://github.com/hydro-project/hydroflow/issues/1253 + commands[Exit] -> for_each(|()| std::process::exit(0)); // TODO: Graceful shutdown https://github.com/hydro-project/hydro/issues/1253 }; diff --git a/datastores/gossip_kv/kv/model.rs b/datastores/gossip_kv/kv/model.rs index 5a4d349496c..80d4983ecf7 100644 --- a/datastores/gossip_kv/kv/model.rs +++ b/datastores/gossip_kv/kv/model.rs @@ -27,7 +27,7 @@ pub type NamespaceMap = MapUnionHashMap>; pub type Namespaces = NamespaceMap>; /// Timestamps used in the model. -// TODO: This will be updated to use a more sophisticated clock type with https://github.com/hydro-project/hydroflow/issues/1207. +// TODO: This will be updated to use a more sophisticated clock type with https://github.com/hydro-project/hydro/issues/1207. pub type Clock = Max; /// TableMap element to upsert a row in an existing TableMap. diff --git a/datastores/gossip_kv/kv/server.rs b/datastores/gossip_kv/kv/server.rs index 553a9991aeb..f3d2afc199e 100644 --- a/datastores/gossip_kv/kv/server.rs +++ b/datastores/gossip_kv/kv/server.rs @@ -239,7 +239,7 @@ where reads -> [1]process_system_table_reads; process_system_table_reads = lattice_bimorphism(KeyedBimorphism::, _>::new(KeyedBimorphism::, _>::new(KeyedBimorphism::, _>::new(PairBimorphism))), #namespaces, #reads) - -> lattice_reduce::<'tick>() // TODO: This can be removed if we fix https://github.com/hydro-project/hydroflow/issues/1401. Otherwise the result can be returned twice if get & gossip arrive in the same tick. + -> lattice_reduce::<'tick>() // TODO: This can be removed if we fix https://github.com/hydro-project/hydro/issues/1401. Otherwise the result can be returned twice if get & gossip arrive in the same tick. -> flat_map(|result: NamespaceMap, SetUnion>>>| { let mut response: Vec<(ClientResponse, Addr)> = vec![]; diff --git a/dfir_datalog/src/lib.rs b/dfir_datalog/src/lib.rs index 43d3c633360..70af732d2b8 100644 --- a/dfir_datalog/src/lib.rs +++ b/dfir_datalog/src/lib.rs @@ -7,7 +7,7 @@ use quote::{quote, ToTokens}; /// /// This uses a variant of Datalog that is similar to [Dedalus](https://www2.eecs.berkeley.edu/Pubs/TechRpts/2009/EECS-2009-173.pdf). /// -/// For examples, see [the datalog tests in the Hydroflow repo](https://github.com/hydro-project/hydroflow/blob/main/dfir_rs/tests/datalog_frontend.rs). +/// For examples, see [the datalog tests in the Hydroflow repo](https://github.com/hydro-project/hydro/blob/main/hydroflow/tests/datalog_frontend.rs). // TODO(mingwei): rustdoc examples inline. #[proc_macro] pub fn datalog(item: proc_macro::TokenStream) -> proc_macro::TokenStream { diff --git a/dfir_lang/src/graph/flat_graph_builder.rs b/dfir_lang/src/graph/flat_graph_builder.rs index 6e82cb5f0df..c08861b22b7 100644 --- a/dfir_lang/src/graph/flat_graph_builder.rs +++ b/dfir_lang/src/graph/flat_graph_builder.rs @@ -687,7 +687,7 @@ impl FlatGraphBuilder { } /// Warns about unused port indexing referenced in [`Self::varname_ends`]. - /// https://github.com/hydro-project/hydroflow/issues/1108 + /// https://github.com/hydro-project/hydro/issues/1108 fn warn_unused_port_indexing(&mut self) { for (_ident, varname_info) in self.varname_ends.iter() { if !varname_info.inn_used { diff --git a/dfir_lang/src/graph/flat_to_partitioned.rs b/dfir_lang/src/graph/flat_to_partitioned.rs index 7d6954b8eeb..838469fdf91 100644 --- a/dfir_lang/src/graph/flat_to_partitioned.rs +++ b/dfir_lang/src/graph/flat_to_partitioned.rs @@ -450,7 +450,7 @@ fn find_subgraph_strata( DelayType::Stratum => { // Any negative edges which go onto the same or previous stratum are bad. // Indicates an unbroken negative cycle. - // TODO(mingwei): This check is insufficient: https://github.com/hydro-project/hydroflow/issues/1115#issuecomment-2018385033 + // TODO(mingwei): This check is insufficient: https://github.com/hydro-project/hydro/issues/1115#issuecomment-2018385033 if dst_stratum <= src_stratum { return Err(Diagnostic::spanned(dst_port.span(), Level::Error, "Negative edge creates a negative cycle which must be broken with a `defer_tick()` operator.")); } diff --git a/dfir_lang/src/graph/ops/anti_join.rs b/dfir_lang/src/graph/ops/anti_join.rs index 2285c5fb643..7b028070c1e 100644 --- a/dfir_lang/src/graph/ops/anti_join.rs +++ b/dfir_lang/src/graph/ops/anti_join.rs @@ -35,7 +35,7 @@ pub const ANTI_JOIN: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 has_singleton_output: false, flo_type: None, ports_inn: Some(|| super::PortListSpec::Fixed(parse_quote! { pos, neg })), diff --git a/dfir_lang/src/graph/ops/anti_join_multiset.rs b/dfir_lang/src/graph/ops/anti_join_multiset.rs index c9c749f5a13..c150955140c 100644 --- a/dfir_lang/src/graph/ops/anti_join_multiset.rs +++ b/dfir_lang/src/graph/ops/anti_join_multiset.rs @@ -35,7 +35,7 @@ pub const ANTI_JOIN_MULTISET: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 has_singleton_output: false, flo_type: None, ports_inn: Some(|| super::PortListSpec::Fixed(parse_quote! { pos, neg })), diff --git a/dfir_lang/src/graph/ops/fold_keyed.rs b/dfir_lang/src/graph/ops/fold_keyed.rs index 9d51f6f468c..e0dbc9a32e0 100644 --- a/dfir_lang/src/graph/ops/fold_keyed.rs +++ b/dfir_lang/src/graph/ops/fold_keyed.rs @@ -78,7 +78,7 @@ pub const FOLD_KEYED: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 has_singleton_output: false, flo_type: None, ports_inn: None, diff --git a/dfir_lang/src/graph/ops/multiset_delta.rs b/dfir_lang/src/graph/ops/multiset_delta.rs index fee459cbda0..8297b21e15c 100644 --- a/dfir_lang/src/graph/ops/multiset_delta.rs +++ b/dfir_lang/src/graph/ops/multiset_delta.rs @@ -43,7 +43,7 @@ pub const MULTISET_DELTA: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 // If `'tick` lifetimes are added. has_singleton_output: false, flo_type: None, diff --git a/dfir_lang/src/graph/ops/persist_mut.rs b/dfir_lang/src/graph/ops/persist_mut.rs index d6ea3c07729..59a54be2e91 100644 --- a/dfir_lang/src/graph/ops/persist_mut.rs +++ b/dfir_lang/src/graph/ops/persist_mut.rs @@ -36,7 +36,7 @@ pub const PERSIST_MUT: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 // If `'tick` lifetimes are added. has_singleton_output: false, flo_type: None, diff --git a/dfir_lang/src/graph/ops/persist_mut_keyed.rs b/dfir_lang/src/graph/ops/persist_mut_keyed.rs index 03ccde780c6..79dc8b8352e 100644 --- a/dfir_lang/src/graph/ops/persist_mut_keyed.rs +++ b/dfir_lang/src/graph/ops/persist_mut_keyed.rs @@ -36,7 +36,7 @@ pub const PERSIST_MUT_KEYED: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 // If `'tick` lifetimes are added. has_singleton_output: false, flo_type: None, diff --git a/dfir_lang/src/graph/ops/reduce_keyed.rs b/dfir_lang/src/graph/ops/reduce_keyed.rs index 9f309ad943f..93dba0c2fa7 100644 --- a/dfir_lang/src/graph/ops/reduce_keyed.rs +++ b/dfir_lang/src/graph/ops/reduce_keyed.rs @@ -68,7 +68,7 @@ pub const REDUCE_KEYED: OperatorConstraints = OperatorConstraints { is_external_input: false, // If this is set to true, the state will need to be cleared using `#context.set_state_tick_hook` // to prevent reading uncleared data if this subgraph doesn't run. - // https://github.com/hydro-project/hydroflow/issues/1298 + // https://github.com/hydro-project/hydro/issues/1298 has_singleton_output: false, flo_type: None, ports_inn: None, diff --git a/dfir_macro/src/lib.rs b/dfir_macro/src/lib.rs index fede8d31de7..cc1eb4808e1 100644 --- a/dfir_macro/src/lib.rs +++ b/dfir_macro/src/lib.rs @@ -15,9 +15,9 @@ use syn::{ /// Create a Hydroflow instance using Hydroflow's custom "surface syntax." /// -/// For example usage, take a look at the [`surface_*` tests in the `tests` folder](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/tests) -/// or the [`examples` folder](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/examples) -/// in the [Hydroflow repo](https://github.com/hydro-project/hydroflow). +/// For example usage, take a look at the [`surface_*` tests in the `tests` folder](https://github.com/hydro-project/hydro/tree/main/dfir_rs/tests) +/// or the [`examples` folder](https://github.com/hydro-project/hydro/tree/main/dfir_rs/examples) +/// in the [Hydroflow repo](https://github.com/hydro-project/hydro). // TODO(mingwei): rustdoc examples inline. #[proc_macro] pub fn dfir_syntax(input: proc_macro::TokenStream) -> proc_macro::TokenStream { diff --git a/dfir_rs/src/lib.rs b/dfir_rs/src/lib.rs index 207bb7da2ce..20b32f75e6e 100644 --- a/dfir_rs/src/lib.rs +++ b/dfir_rs/src/lib.rs @@ -14,7 +14,7 @@ //! hf.run_available(); //! ``` //! -//! For more examples, check out the [`examples` folder on Github](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/examples). +//! For more examples, check out the [`examples` folder on Github](https://github.com/hydro-project/hydro/tree/main/dfir_rs/examples). pub mod compiled; pub mod scheduled; diff --git a/dfir_rs/tests/surface_lattice_bimorphism.rs b/dfir_rs/tests/surface_lattice_bimorphism.rs index 7d33cea65f4..2554cba517a 100644 --- a/dfir_rs/tests/surface_lattice_bimorphism.rs +++ b/dfir_rs/tests/surface_lattice_bimorphism.rs @@ -111,7 +111,7 @@ pub fn test_join() { ); } -/// Test for https://github.com/hydro-project/hydroflow/issues/1298 +/// Test for https://github.com/hydro-project/hydro/issues/1298 #[multiplatform_test] pub fn test_cartesian_product_tick_state() { let (lhs_send, lhs_recv) = dfir_rs::util::unbounded_channel::(); diff --git a/dfir_rs/tests/surface_lattice_join.rs b/dfir_rs/tests/surface_lattice_join.rs index cac1082547f..654be7f9c3f 100644 --- a/dfir_rs/tests/surface_lattice_join.rs +++ b/dfir_rs/tests/surface_lattice_join.rs @@ -146,7 +146,7 @@ pub fn test_lattice_join_fused_join() { df.run_tick(); let out: Vec<_> = collect_ready(&mut out_rx); - // TODO(mingwei): Should only be one, but bug: https://github.com/hydro-project/hydroflow/issues/1050#issuecomment-1924338317 + // TODO(mingwei): Should only be one, but bug: https://github.com/hydro-project/hydro/issues/1050#issuecomment-1924338317 assert_eq!(out, [SingletonMap(7, (4, 6)), SingletonMap(7, (4, 6))]); } } diff --git a/docs/docs/dfir/architecture/index.mdx b/docs/docs/dfir/architecture/index.mdx index ee16213b6fb..7ab3b337599 100644 --- a/docs/docs/dfir/architecture/index.mdx +++ b/docs/docs/dfir/architecture/index.mdx @@ -90,5 +90,5 @@ Compiled push-based iterators live in [`dfir_rs::compiled`](https://hydro.run/ru When working with DFIR, we intend users to use the Flow Syntax as it is much more friendly, but as DFIR is in active development some operators might not be available in the Flow Syntax, in which case the Core API can be used instead. If you find -yourself in this situation be sure to [submit an issue](https://github.com/hydro-project/hydroflow/issues/new)! +yourself in this situation be sure to [submit an issue](https://github.com/hydro-project/hydro/issues/new)! diff --git a/docs/docs/dfir/concepts/index.md b/docs/docs/dfir/concepts/index.md index 89b34ed787c..0baa66c9aaa 100644 --- a/docs/docs/dfir/concepts/index.md +++ b/docs/docs/dfir/concepts/index.md @@ -42,7 +42,7 @@ which send and receive flows of data to each other. ### So how might a human write distributed systems with DFIR? As an illustration of how you can work at the DFIR layer, consider the -[Chat Server example](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/examples/chat). If you run that binary +[Chat Server example](https://github.com/hydro-project/hydro/tree/main/dfir_rs/examples/chat). If you run that binary with the command-line argument `--role server` it will start a single transducer that is responsible for a chat server: receiving membership requests and messages from clients, and forwarding messages from individual clients to all other clients. If you run that binary with the argument `--role client` it will start a transducer that is responsible for a chat client, which diff --git a/docs/docs/dfir/ecosystem.md b/docs/docs/dfir/ecosystem.md index 7ecb3ecb184..e5b45fd115d 100644 --- a/docs/docs/dfir/ecosystem.md +++ b/docs/docs/dfir/ecosystem.md @@ -15,7 +15,7 @@ Working down from the top: - *Hydrolysis* is a compiler that translates a global Hydro spec to multiple single-threaded DFIR programs, which collectively implement the global spec. This compilation phase is currently a part of the Hydro codebase, but will evolve into a standalone optimizing compiler inspired by database query optimizers and [e-graphs](https://en.wikipedia.org/wiki/E-graph). -- [DFIR and its compiler/runtime](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs) are the subject of this book. +- [DFIR and its compiler/runtime](https://github.com/hydro-project/hydro/tree/main/dfir_rs) are the subject of this book. Where Hydro is a *global* language for programming a fleet of processes, DFIR is a *local* language for programming a single process that participates in a distributed system. More specifically, DFIR is an internal representation (IR) language and runtime library that generates the low-level Rust code for an individual transducer. As a low-level IR, DFIR is not intended for the general-purpose programmer. For most users it is intended as a readable compiler target from Hydro; advanced developers can also use it to manually program individual transducers. - [HydroDeploy](../deploy) is a service for launching DFIR transducers on a variety of platforms. diff --git a/docs/docs/dfir/index.mdx b/docs/docs/dfir/index.mdx index cc04ff714c2..3f28f31fb9b 100644 --- a/docs/docs/dfir/index.mdx +++ b/docs/docs/dfir/index.mdx @@ -13,4 +13,4 @@ This book will teach you how to set up your environment to get started with DFIR Keep in mind that DFIR is under active development. However the code in this book is tested with the DFIR library so should always be up-to-date. -If you have any questions, feel free to [create an issue on Github](https://github.com/hydro-project/hydroflow/issues/new). +If you have any questions, feel free to [create an issue on Github](https://github.com/hydro-project/hydro/issues/new). diff --git a/docs/docs/dfir/quickstart/example_7_networking.mdx b/docs/docs/dfir/quickstart/example_7_networking.mdx index e60cbcd2d22..53dfb6fa51d 100644 --- a/docs/docs/dfir/quickstart/example_7_networking.mdx +++ b/docs/docs/dfir/quickstart/example_7_networking.mdx @@ -42,6 +42,6 @@ cases of these protocols can help you choose the right one for your networked se ## Additional Examples The DFIR examples directory contains additional examples that deal with networking. For example, the [Randomized -Gossip Server](https://github.com/hydro-project/hydroflow/blob/main/dfir_rs/examples/chat/randomized_gossiping_server.rs) +Gossip Server](https://github.com/hydro-project/hydro/blob/main/dfir_rs/examples/chat/randomized_gossiping_server.rs) example extends the chat example to work with a cluster of redundant servers that use gossip for sharing chat-related state between themselves. \ No newline at end of file diff --git a/docs/docs/dfir/quickstart/setup.md b/docs/docs/dfir/quickstart/setup.md index 4c7b5de75a3..29eac7a4cbc 100644 --- a/docs/docs/dfir/quickstart/setup.md +++ b/docs/docs/dfir/quickstart/setup.md @@ -110,7 +110,7 @@ Hello! 2023-06-01 00:19:53.906635 UTC: Got Echo { payload: "Hello!", ts: 2023-06-01T00:19:53.906123Z } from 127.0.0.1:61019 ``` -## Alternative: Checking out the Hydroflow Repository +## Alternative: Checking out the Hydro Repository This book will assume you are using the template project, but some Rust experts may want to get started with DFIR by cloning and working in the @@ -120,7 +120,7 @@ changes. To clone the repo, run: ```bash -git clone git@github.com:hydro-project/hydroflow.git +git clone git@github.com:hydro-project/hydro.git ``` DFIR requires nightly Rust, but the repo is already configured for it via `rust-toolchain.toml`. @@ -129,14 +129,14 @@ You can then open the repo in VS Code or IDE of your choice. In VS Code, `rust-a will provide inline type and error messages, code completion, etc. To work with the repository, it's best to start with an "example", found in the -[`dfir/examples` folder](https://github.com/hydro-project/hydroflow/tree/main/dfir_rs/examples). +[`dfir/examples` folder](https://github.com/hydro-project/hydro/tree/main/dfir_rs/examples). The simplest example is the -['hello world'](https://github.com/hydro-project/hydroflow/blob/main/dfir_rs/examples/hello_world/main.rs) example; +['hello world'](https://github.com/hydro-project/hydro/blob/main/dfir_rs/examples/hello_world/main.rs) example; the simplest example with networking is the -[`echo server`](https://github.com/hydro-project/hydroflow/blob/main/dfir_rs/examples/echoserver/main.rs). +[`echo server`](https://github.com/hydro-project/hydro/blob/main/dfir_rs/examples/echoserver/main.rs). The DFIR repository is set up as a [workspace](https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html), i.e. a repo containing a bunch of separate packages, `dfir_rs` is just the main one. So if you want to work in a proper separate cargo package, you can -create one and add it into the [root `Cargo.toml`](https://github.com/hydro-project/hydroflow/blob/main/Cargo.toml), -much like the [provided template](https://github.com/hydro-project/hydroflow/tree/main/template/dfir#readme). +create one and add it into the [root `Cargo.toml`](https://github.com/hydro-project/hydro/blob/main/Cargo.toml), +much like the [provided template](https://github.com/hydro-project/hydro/tree/main/template/dfir#readme). diff --git a/docs/docs/hydro/index.mdx b/docs/docs/hydro/index.mdx index 23d0ab7704e..777e98fe233 100644 --- a/docs/docs/hydro/index.mdx +++ b/docs/docs/hydro/index.mdx @@ -11,6 +11,6 @@ Hydro has been used to write a variety of high-performance distributed systems, :::caution -The docs for Hydro are still a work in progress. If you have any questions or run into bugs, please file an issue on the [Hydro GitHub repository](https://github.com/hydro-project/hydroflow). +The docs for Hydro are still a work in progress. If you have any questions or run into bugs, please file an issue on the [Hydro GitHub repository](https://github.com/hydro-project/hydro). ::: diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 2ebb7da63fb..6ffe3f4dac3 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -67,7 +67,7 @@ const config = { // Please change this to your repo. // Remove this to remove the "edit this page" links. editUrl: - 'https://github.com/hydro-project/hydroflow/tree/main/docs/', + 'https://github.com/hydro-project/hydro/tree/main/docs/', remarkPlugins: [math], rehypePlugins: [katex], }, @@ -76,7 +76,7 @@ const config = { // // Please change this to your repo. // // Remove this to remove the "edit this page" links. // editUrl: - // 'https://github.com/hydro-project/hydroflow/tree/main/docs/', + // 'https://github.com/hydro-project/hydro/tree/main/docs/', // }, theme: { customCss: require.resolve('./src/css/custom.css'), @@ -156,7 +156,7 @@ const config = { }, // {to: '/blog', label: 'Blog', position: 'left'}, { - href: 'https://github.com/hydro-project/hydroflow', + href: 'https://github.com/hydro-project/hydro', label: 'GitHub', position: 'right', }, @@ -204,7 +204,7 @@ const config = { // }, { label: 'GitHub', - href: 'https://github.com/hydro-project/hydroflow', + href: 'https://github.com/hydro-project/hydro', }, ], }, diff --git a/docs/src/pages/playground.js b/docs/src/pages/playground.js index 3f2bf18aad7..e3b2bf951ca 100644 --- a/docs/src/pages/playground.js +++ b/docs/src/pages/playground.js @@ -66,7 +66,7 @@ source_iter(0..10) -> for_each(|n| println!("Howdy {}", n));`, "Chat Server": `\ -// https://github.com/hydro-project/hydroflow/blob/main/template/dfir/src/server.rs +// https://github.com/hydro-project/hydro/blob/main/template/dfir/src/server.rs // Define shared inbound and outbound channels outbound_chan = union() -> dest_sink_serde(outbound); inbound_chan = source_stream_serde(inbound) @@ -87,7 +87,7 @@ inbound_chan[msgs] -> [0]broadcast; clients[1] -> [1]broadcast;`, "Chat Client": `\ -// https://github.com/hydro-project/hydroflow/blob/main/template/dfir/src/client.rs +// https://github.com/hydro-project/hydro/blob/main/template/dfir/src/client.rs // set up channels outbound_chan = union() -> dest_sink_serde(outbound); inbound_chan = source_stream_serde(inbound) -> map(|(m, _)| m) diff --git a/template/dfir/Cargo.toml b/template/dfir/Cargo.toml index d1f521008d6..7599406e9cf 100644 --- a/template/dfir/Cargo.toml +++ b/template/dfir/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] chrono = { version = "0.4.20", features = [ "serde" ], default-features = true } clap = { version = "4.5.4", features = [ "derive" ] } -dfir_rs = { git = "{{ hydro_git | default: 'https://github.com/hydro-project/hydroflow.git' }}", branch = "{{ hydro_branch | default: 'main' }}" } +dfir_rs = { git = "{{ hydro_git | default: 'https://github.com/hydro-project/hydro.git' }}", branch = "{{ hydro_branch | default: 'main' }}" } serde = { version = "1.0.197", features = [ "derive" ] } diff --git a/template/dfir/README.md b/template/dfir/README.md index cf2fea43b02..bbfa6720f20 100644 --- a/template/dfir/README.md +++ b/template/dfir/README.md @@ -1,5 +1,5 @@ ## Getting Started -This is a template for a Rust project that uses [Hydroflow](http://github.com/hydro-project/hydroflow) for +This is a template for a Rust project that uses [Hydroflow](http://github.com/hydro-project/hydro) for distributed services. It implements a simple echo server and client over UDP. ## Using the Template @@ -50,7 +50,7 @@ The `src` directory contains the following files: ## Communication Patterns No particular communication pattern is assumed by Hydroflow. The unmodified template application is designed to be used in a "star topology": multiple independent clients talking to a single server. However, the template can be easily modified to support other topologies. -Additional examples are provided in the [hydroflow](https://github.com/hydro-project/hydroflow) repository in the `hydroflow/examples` directory. +Additional examples are provided in the [hydroflow](https://github.com/hydro-project/hydro) repository in the `hydroflow/examples` directory. ## Where do you go from here? This template is intended to be a starting point for your own project. You'll undoubtedly want to change it.