wip: remove all the things

Author: teskje

Cargo.lock

@@ -10,7 +10,7 @@
 # by the Apache License, Version 2.0.
 
 load("@crates_io//:defs.bzl", "aliases", "all_crate_deps")
-load("@rules_rust//cargo:defs.bzl", "cargo_build_script", "extract_cargo_lints")
+load("@rules_rust//cargo:defs.bzl", "extract_cargo_lints")
 load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
 
 package(default_visibility = ["//visibility:public"])
@@ -31,7 +31,6 @@ rust_library(
     rustc_flags = [],
     version = "0.0.0",
     deps = [
-        ":mz_cluster_client_build_script",
         "//src/ore:mz_ore",
         "//src/proto:mz_proto",
     ] + all_crate_deps(normal = True),
@@ -85,23 +84,6 @@ rust_doc_test(
     ),
 )
 
-filegroup(
-    name = "all_protos",
-    srcs = ["src/client.proto"],
-)
-
-cargo_build_script(
-    name = "mz_cluster_client_build_script",
-    srcs = ["build.rs"],
-    build_script_env = {},
-    compile_data = [],
-    data = [":all_protos"],
-    proc_macro_deps = [] + all_crate_deps(build_proc_macro = True),
-    rustc_env = {},
-    rustc_flags = [],
-    deps = ["//src/build-tools:mz_build_tools"] + all_crate_deps(build = True),
-)
-
 extract_cargo_lints(
     name = "lints",
     manifest = "Cargo.toml",

src/cluster-client/BUILD.bazel

@@ -20,7 +20,6 @@ proptest-derive = { version = "0.5.1", features = ["boxed_union"] }
 prost = { version = "0.13.5", features = ["no-recursion-limit"] }
 serde = { version = "1.0.219", features = ["derive"] }
 tokio-stream = "0.1.17"
-tonic = "0.12.1"
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
 [build-dependencies]

src/cluster-client/Cargo.toml

@@ -11,14 +11,11 @@
 
 use std::num::NonZeroI64;
 
-use mz_proto::{ProtoType, RustType, TryFromProtoError};
 use proptest::prelude::{Arbitrary, any};
 use proptest::strategy::{BoxedStrategy, Strategy};
 use proptest_derive::Arbitrary;
 use serde::{Deserialize, Serialize};
 
-include!(concat!(env!("OUT_DIR"), "/mz_cluster_client.client.rs"));
-
 /// A value generated by environmentd and passed to the clusterd processes
 /// to help them disambiguate different `CreateTimely` commands.
 ///
@@ -43,24 +40,6 @@ impl ClusterStartupEpoch {
     }
 }
 
-impl RustType<ProtoClusterStartupEpoch> for ClusterStartupEpoch {
-    fn into_proto(&self) -> ProtoClusterStartupEpoch {
-        let Self { envd, replica } = self;
-        ProtoClusterStartupEpoch {
-            envd: envd.get(),
-            replica: *replica,
-        }
-    }
-
-    fn from_proto(proto: ProtoClusterStartupEpoch) -> Result<Self, TryFromProtoError> {
-        let ProtoClusterStartupEpoch { envd, replica } = proto;
-        Ok(Self {
-            envd: envd.try_into().unwrap(),
-            replica,
-        })
-    }
-}
-
 impl Arbitrary for ClusterStartupEpoch {
     type Strategy = BoxedStrategy<Self>;
     type Parameters = ();
@@ -162,32 +141,6 @@ pub struct TimelyConfig {
     pub zero_copy_limit: Option<usize>,
 }
 
-impl RustType<ProtoTimelyConfig> for TimelyConfig {
-    fn into_proto(&self) -> ProtoTimelyConfig {
-        ProtoTimelyConfig {
-            workers: self.workers.into_proto(),
-            addresses: self.addresses.into_proto(),
-            process: self.process.into_proto(),
-            arrangement_exert_proportionality: self.arrangement_exert_proportionality,
-            enable_zero_copy: self.enable_zero_copy,
-            enable_zero_copy_lgalloc: self.enable_zero_copy_lgalloc,
-            zero_copy_limit: self.zero_copy_limit.into_proto(),
-        }
-    }
-
-    fn from_proto(proto: ProtoTimelyConfig) -> Result<Self, TryFromProtoError> {
-        Ok(Self {
-            process: proto.process.into_rust()?,
-            workers: proto.workers.into_rust()?,
-            addresses: proto.addresses.into_rust()?,
-            arrangement_exert_proportionality: proto.arrangement_exert_proportionality,
-            enable_zero_copy: proto.enable_zero_copy,
-            enable_zero_copy_lgalloc: proto.enable_zero_copy_lgalloc,
-            zero_copy_limit: proto.zero_copy_limit.into_rust()?,
-        })
-    }
-}
-
 impl TimelyConfig {
     /// Split the timely configuration into `parts` pieces, each with a different `process` number.
     pub fn split_command(&self, parts: usize) -> Vec<Self> {
@@ -225,33 +178,3 @@ pub struct ClusterReplicaLocation {
     /// The workers per process in the replica.
     pub workers: usize,
 }
-
-#[cfg(test)]
-mod tests {
-    use mz_ore::assert_ok;
-    use mz_proto::protobuf_roundtrip;
-    use proptest::prelude::ProptestConfig;
-    use proptest::proptest;
-
-    use super::*;
-
-    proptest! {
-        #![proptest_config(ProptestConfig::with_cases(32))]
-
-        #[mz_ore::test]
-        #[cfg_attr(miri, ignore)] // slow
-        fn timely_config_protobuf_roundtrip(expect in any::<TimelyConfig>() ) {
-            let actual = protobuf_roundtrip::<_, ProtoTimelyConfig>(&expect);
-            assert_ok!(actual);
-            assert_eq!(actual.unwrap(), expect);
-        }
-
-        #[mz_ore::test]
-        #[cfg_attr(miri, ignore)] // slow
-        fn cluster_startup_epoch_protobuf_roundtrip(expect in any::<ClusterStartupEpoch>() ) {
-            let actual = protobuf_roundtrip::<_, ProtoClusterStartupEpoch>(&expect);
-            assert_ok!(actual);
-            assert_eq!(actual.unwrap(), expect);
-        }
-    }
-}

src/cluster-client/build.rs

@@ -10,7 +10,7 @@
 # by the Apache License, Version 2.0.
 
 load("@crates_io//:defs.bzl", "aliases", "all_crate_deps")
-load("@rules_rust//cargo:defs.bzl", "cargo_build_script", "extract_cargo_lints")
+load("@rules_rust//cargo:defs.bzl", "extract_cargo_lints")
 load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
 
 package(default_visibility = ["//visibility:public"])
@@ -31,7 +31,6 @@ rust_library(
     rustc_flags = [],
     version = "0.0.0",
     deps = [
-        ":mz_compute_client_build_script",
         "//src/build-info:mz_build_info",
         "//src/cluster-client:mz_cluster_client",
         "//src/compute-types:mz_compute_types",
@@ -133,38 +132,6 @@ rust_doc_test(
     ),
 )
 
-filegroup(
-    name = "all_protos",
-    srcs = [
-        "src/logging.proto",
-        "src/protocol/command.proto",
-        "src/protocol/response.proto",
-        "src/service.proto",
-        "//src/cluster-client:all_protos",
-        "//src/compute-types:all_protos",
-        "//src/dyncfg:all_protos",
-        "//src/expr:all_protos",
-        "//src/proto:all_protos",
-        "//src/repr:all_protos",
-        "//src/service:all_protos",
-        "//src/storage-client:all_protos",
-        "//src/storage-types:all_protos",
-        "//src/tracing:all_protos",
-    ],
-)
-
-cargo_build_script(
-    name = "mz_compute_client_build_script",
-    srcs = ["build.rs"],
-    build_script_env = {},
-    compile_data = [],
-    data = [":all_protos"],
-    proc_macro_deps = [] + all_crate_deps(build_proc_macro = True),
-    rustc_env = {},
-    rustc_flags = [],
-    deps = ["//src/build-tools:mz_build_tools"] + all_crate_deps(build = True),
-)
-
 extract_cargo_lints(
     name = "lints",
     manifest = "Cargo.toml",

src/cluster-client/src/client.proto

@@ -46,7 +46,6 @@ thiserror = "2.0.12"
 timely = "0.20.0"
 tokio = "1.44.1"
 tokio-stream = "0.1.17"
-tonic = "0.12.1"
 tracing = "0.1.37"
 uuid = { version = "1.16.0", features = ["serde", "v4"] }
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }