From 0720530a2969f8f2911e6d2832731131b81aceee Mon Sep 17 00:00:00 2001
From: Robert Escriva <robert@trychroma.com>
Date: Mon, 2 Dec 2024 13:08:31 -0800
Subject: [PATCH] [CHORE] To the workspace with shared deps.

This PR moves to the workspace's Cargo.toml any package used by both
chroma_load and another package.  It also drops patch version for easier
upgrades.
---
 Cargo.toml                | 39 ++++++++++++++++++++++++---------------
 rust/benchmark/Cargo.toml |  2 +-
 rust/cache/Cargo.toml     |  2 +-
 rust/load/Cargo.toml      | 38 ++++++++++++++++++--------------------
 rust/worker/Cargo.toml    | 15 ++++++---------
 5 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b70f459eb378..db1f6655c18b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,30 +17,39 @@ members = [
 ]
 
 [workspace.dependencies]
+arrow = "52.0.0"
+async-trait = "0.1"
+chrono = { version = "0.4", features = ["serde"] }
+clap = { version = "4", features = ["derive"] }
+criterion = { version = "0.5", features = ["async_tokio"] }
+figment = { version = "0.10.12", features = ["env", "yaml", "test"] }
+flatbuffers = "24.3.25"
+futures = "0.3"
+num_cpus = "1.16.0"
+opentelemetry = { version = "0.27.0", default-features = false, features = ["trace", "metrics"] }
+opentelemetry-otlp = "0.27"
+opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
+parking_lot = { version = "0.12.1", features = ["serde"] }
+prost = "0.13"
+prost-types = "0.12"
+roaring = "0.10.3"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
-arrow = "52.0.0"
+tantivy = "0.21.1"
 thiserror = "1.0.50"
+tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
+tokio-util = "0.7.10"
+tonic = "0.12"
+tracing = "0.1"
+tracing-bunyan-formatter = "0.3"
+tracing-opentelemetry = "0.28.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 uuid = { version = "1.6.1", features = [
    "v4",
    "fast-rng",
    "macro-diagnostics",
    "serde",
 ] }
-async-trait = "0.1.74"
-roaring = "0.10.3"
-futures = "0.3"
-parking_lot = { version = "0.12.1", features = ["serde"] }
-tracing = "0.1"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
-tokio-util = "0.7.10"
-tonic = "0.12"
-prost = "0.13"
-prost-types = "0.12"
-num_cpus = "1.16.0"
-flatbuffers = "24.3.25"
-tantivy = "0.21.1"
-criterion = { version = "0.5", features = ["async_tokio"] }
 
 chroma-benchmark = { path = "rust/benchmark" }
 chroma-blockstore = { path = "rust/blockstore" }
diff --git a/rust/benchmark/Cargo.toml b/rust/benchmark/Cargo.toml
index ca6ac4372e30..c116b69f153a 100644
--- a/rust/benchmark/Cargo.toml
+++ b/rust/benchmark/Cargo.toml
@@ -16,6 +16,7 @@ async-compression = { version = "0.4.12", features = [
 ] }
 
 bincode = { workspace = true }
+clap = { workspace = true }
 criterion = { workspace = true }
 futures = { workspace = true }
 indicatif = { workspace = true }
@@ -27,7 +28,6 @@ tempfile = { workspace = true }
 tokio = { workspace = true }
 uuid = { workspace = true }
 
-clap = { version = "4.5.17", features = ["derive"] }
 dirs = "5.0.1"
 reqwest = { version = "0.12.7", features = ["stream"] }
 tokio-stream = { version = "0.1.16", features = ["full"] }
diff --git a/rust/cache/Cargo.toml b/rust/cache/Cargo.toml
index 4e8a3814be92..2a216b0cf11e 100644
--- a/rust/cache/Cargo.toml
+++ b/rust/cache/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true }
 foyer = "0.12"
 anyhow = "1.0"
 opentelemetry = { version = "0.27.0", default-features = false, features = [
diff --git a/rust/load/Cargo.toml b/rust/load/Cargo.toml
index 4eebef01948b..811fb3e5d92c 100644
--- a/rust/load/Cargo.toml
+++ b/rust/load/Cargo.toml
@@ -4,28 +4,26 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait = { workspace = true }
+chrono = { workspace = true }
+clap = { workspace = true }
+figment = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+uuid = { workspace = true }
+
+tracing = { workspace = true }
+tracing-bunyan-formatter = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+tracing-subscriber = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-otlp = { workspace = true }
+opentelemetry_sdk = { workspace = true }
+
+# Unlikely to be used in the workspace.
 axum = "0.7"
 chromadb = { git = "https://github.com/rescrv/chromadb-rs", rev = "e364e35c34c660d4e8e862436ea600ddc2f46a1e" }
-chrono = { version = "0.4.38", features = ["serde"] }
-clap = { version = "4", features = ["derive"] }
-figment = { version = "0.10.12", features = ["env", "yaml", "test"] }
 guacamole = { version = "0.9", default-features = false }
-serde.workspace = true
-
-serde_json.workspace = true
-tokio.workspace = true
-uuid.workspace = true
-
-tracing-bunyan-formatter = "0.3"
-tracing-opentelemetry = "0.28.0"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-opentelemetry = { version = "0.27.0", default-features = false, features = [
-  "trace",
-  "metrics",
-] }
-opentelemetry-otlp = "0.27"
-opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
-tracing.workspace = true
 tower-http = { version = "0.6.2", features = ["trace"] }
 reqwest = { version = "0.12", features = ["json"] }
diff --git a/rust/worker/Cargo.toml b/rust/worker/Cargo.toml
index cc8105db62e6..f8558185627e 100644
--- a/rust/worker/Cargo.toml
+++ b/rust/worker/Cargo.toml
@@ -17,17 +17,13 @@ murmur3 = "0.5.2"
 schemars = "0.8.16"
 kube = { version = "0.87.1", features = ["runtime", "derive"] }
 k8s-openapi = { version = "0.20.0", features = ["latest"] }
-tracing-bunyan-formatter = "0.3"
-tracing-opentelemetry = "0.28.0"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-opentelemetry = { version = "0.27.0", default-features = false, features = [
-  "trace",
-  "metrics",
-] }
-opentelemetry-otlp = "0.27"
+tracing-bunyan-formatter = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+tracing-subscriber = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-otlp = { workspace = true }
 opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
 regex = "1.10.5"
-figment = { version = "0.10.12", features = ["env", "yaml", "test"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.6"
@@ -39,6 +35,7 @@ thiserror = { workspace = true }
 uuid = { workspace = true }
 async-trait = { workspace = true }
 roaring = { workspace = true }
+figment = { workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true }
 tracing = { workspace = true }