Skip to content

Commit

Permalink
Revert "Revert "treewide: Use workspace dependencies""
Browse files Browse the repository at this point in the history
This reverts commit 337df377be353ebd4f0fa548f1301997ba7d3e28.

Change-Id: I73174d2aa27cb077941eab13ab1b613a6e6a4a07
  • Loading branch information
ethowitz committed May 7, 2024
1 parent d1761d2 commit 41fe772
Show file tree
Hide file tree
Showing 57 changed files with 910 additions and 798 deletions.
164 changes: 53 additions & 111 deletions Cargo.lock

Large diffs are not rendered by default.

166 changes: 166 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ clap = "4.3"
consulrs = { git = "https://github.com/readysettech/consulrs.git", branch = "allow-disabling-rustls-tls-2" }
criterion = "0.5"
eui48 = { git = "https://github.com/readysettech/eui48.git", branch = "master", default-features = false }
fork = "0.1"
mysql_async = { git = "https://github.com/readysettech/mysql_async" }
nperf-core = { git = "https://github.com/readysettech/not-perf.git" }
postgres = { git = "https://github.com/readysettech/rust-postgres.git"}
Expand All @@ -79,6 +80,171 @@ rocksdb = { git = "https://github.com/readysettech/rust-rocksdb.git", default-fe
metrics-exporter-prometheus = { git = "https://github.com/readysettech/metrics.git" }
metrics = { git = "https://github.com/readysettech/metrics.git" }
metrics-util = { git = "https://github.com/readysettech/metrics.git" }
ahash = "0.7"
anyhow = "1.0.42"
assert_approx_eq = "1.1.0"
assert_unordered = "0.3"
async-bincode = "0.6.1"
async-stream = "0.3.2"
async-trait = "0.1"
atomic-counter = "1.0.1"
backoff = "0.4.0"
backtrace = "=0.3.65"
bimap = "0.6.3"
bincode = "1.3.3"
bit-vec = "0.6"
blake2 = "0.10"
bufstream = "0.1.3"
byteorder = "1.0.0"
bytes = "1.0.1"
chashmap = "2.1.0"
chrono = "0.4.19"
chrono-tz = "0.8.6"
cidr = "0.2.1"
cloudflare-zlib = "0.2.9"
console = "0.15.5"
const-str = "0.5"
crossbeam-skiplist = "0.1.1"
csv = "1.2"
dashmap = "4.0.2"
deadpool-postgres = "0.10.3"
derive_builder = "0.11.2"
derive_more = "0.99.17"
diff = "0.1.10"
enum-display-derive = "0.1.1"
enum-kinds = "0.5.1"
enum_dispatch = "0.3.7"
envy = "0.4"
fail = "0.5.0"
fallible-iterator = "0.2.0"
fixedbitset = { version = "0.2.0", default-features = false }
futures = "0.3.21"
futures-core = "0.3.14"
futures-executor = "0.3.14"
futures-sink = "0.3.14"
futures-util = "0.3.14"
fxhash = "0.2.1"
getrandom = "0.2.2"
growable-bloom-filter = "2.0.1"
hashbag = "0.1.2"
hdrhistogram = "7.4"
hex = "0.4.3"
hmac = "0.12.1"
humantime = "2.1"
hyper = "0.14.10"
include_dir = "0.6.2"
indexmap = { version = "1.9.2", default-features = false }
indicatif = "0.17"
indoc = "1.0.3"
iter-enum = "1.1.1"
itertools = "0.10.4"
lazy_static = "1.4.0"
left-right = "0.11"
libc = "0.2"
lru = "0.12.0"
machine-uid = "0.2"
md5 = "0.7.0"
mysql = "25"
mysql_common = "0.32"
native-tls = "0.2.8"
ndarray = "0.15.4"
nom = "7.1.1"
nom_locate = "4.0.0"
notify = "6.1.1"
num-integer = "0.1.44"
num_cpus = "1.16.0"
once_cell = "1.14"
opentelemetry = "0.21.0"
opentelemetry-otlp = "0.14.0"
opentelemetry-semantic-conventions = "0.13"
opentelemetry_sdk = "0.21.2"
parking_lot = "0.12.0"
paste = "1.0.5"
petgraph = "0.5"
pin-project = "1.0"
pprof = "0.13"
pratt = "0.3.0"
pretty_assertions = "1.4.0"
prettytable = "0.10.0"
proc-macro2 = "1"
prometheus-parse = "0.2.2"
proptest = "1.0.0"
quanta = { version = "0.11", default-features = false }
querystring = "1.1.0"
quote = "1.0.8"
rand = "0.8.5"
rand_distr = "0.4"
rand_regex = "0.15.1"
redis = "0.23.3"
regex = "1.8.4"
reqwest = "0.11.20"
rlimit = "0.10.1"
rmp-serde = "1.1.2"
rust_decimal = "1.26"
rusty-fork = "0.3.0"
rustyline = "11.0"
rustyline-derive = "0.6.0"
scopeguard = "1.1.0"
serde = "1.0.137"
serde_bytes = "0.11"
serde_derive = "1.0.8"
serde_json = "1.0.89"
serde_stacker = "0.1.7"
serde_with = "1.12"
serde_with_macros = "2.0.0"
serde_yaml = "0.8"
serial_test = "0.5.1"
sha-1 = "0.10.0"
sha1 = "0.10"
sha2 = "0.10.6"
slab = "0.4.2"
slotmap = "1.0.6"
smallvec = { version = "1.9.0", default-features = false }
socket2 = "0.4"
sqlformat = "0.2.1"
sqlparser = "0.41.0"
strawpoll = "0.2.2"
streaming-iterator = "0.1"
stringprep = "0.1.2"
structopt = "0.2"
strum = "0.23"
strum_macros = "0.23"
syn = { version = "1.0.57", default-features = false }
temp-dir = "0.1"
tempfile = "3.8.1"
test-strategy = "0.2.0"
textwrap = "0.14"
thiserror = "1.0.31"
tikv-jemalloc-ctl = "0.5.0"
tikv-jemalloc-sys = "0.5.0"
tikv-jemallocator = "0.5.0"
time = "0.3"
timekeeper = { version = "0.3.2", default-features = false }
tokio-native-tls = "0.3.1"
tokio-retry = "0.3"
tokio-scoped = "0.2.0"
tokio-stream = "0.1.5"
tokio-tower = "0.5.1"
tokio-util = "0.6.6"
toml = "0.5"
tower = "0.4.6"
tower-layer = "0.3.1"
tower-service = "0.3.1"
tracing = "0.1.40"
tracing-appender = "0.2.3"
tracing-attributes = "0.1.27"
tracing-futures = "0.2.5"
tracing-opentelemetry = "0.22.0"
tracing-subscriber = "0.3.9"
triomphe = "0.1"
tuple = "0.5.1"
url = "2.2.2"
uuid = "0.8"
vec1 = "1.8.0"
vec_map = "0.8.0"
vmemcached = "0.5.0"
walkdir = "2.3.2"
zipf = "7.0.0"

[profile.release]
debug=true
Expand Down
4 changes: 2 additions & 2 deletions array2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
serde = { version = "1.0.137", features = ["derive"] }
thiserror = "1.0.31"
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
76 changes: 38 additions & 38 deletions benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,45 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
crossbeam-skiplist = "0.1.1"
crossbeam-skiplist = { workspace = true }
tokio = { workspace = true, features = ["full"] }
anyhow = "1.0.38"
csv = "1.2"
nom = "7.1"
nom_locate = "4.0.0"
rand = "0.8.3"
rand_distr = "0.4"
tracing = "0.1.29"
async-trait = "0.1"
enum_dispatch = "0.3.7"
futures = "0.3"
vec1 = "1.8.0"
url = "2.2.2"
hdrhistogram = "7.4"
zipf = "7.0.0"
anyhow = { workspace = true }
csv = { workspace = true }
nom = { workspace = true }
nom_locate = { workspace = true }
rand = { workspace = true }
rand_distr = { workspace = true }
tracing = { workspace = true }
async-trait = { workspace = true }
enum_dispatch = { workspace = true }
futures = { workspace = true }
vec1 = { workspace = true }
url = { workspace = true }
hdrhistogram = { workspace = true }
zipf = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
reqwest = { version = "0.11.20", features = ["stream", "native-tls"] }
chrono = "0.4"
atomic-counter = "1.0.1"
serde_json = "1.0"
serde_yaml = "0.8"
serde = "1.0"
serde_with = "1.12"
reqwest = { workspace = true, features = ["stream", "native-tls"] }
chrono = { workspace = true }
atomic-counter = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
serde = { workspace = true }
serde_with = { workspace = true }
metrics = { workspace = true }
metrics-util = { workspace = true }
metrics-exporter-prometheus = { workspace = true }
itertools = "0.10"
num-integer = "0.1.44"
lazy_static = "1.4.0"
thiserror = "1.0.30"
async-stream = "0.3.2"
parking_lot = "0.11.2"
indicatif = "0.17"
prometheus-parse = "0.2.2"
walkdir = "2.3"
itertools = { workspace = true }
num-integer = { workspace = true }
lazy_static = { workspace = true }
thiserror = { workspace = true }
async-stream = { workspace = true }
parking_lot = { workspace = true }
indicatif = { workspace = true }
prometheus-parse = { workspace = true }
walkdir = { workspace = true }
tokio-postgres = { workspace = true }
vmemcached = "0.5.0"
redis = { version = "0.23.3", features = ["tokio-comp", "aio"] }
vmemcached = { workspace = true }
redis = { workspace = true, features = ["tokio-comp", "aio"] }

# local dependencies
database-utils = { path = "../database-utils" }
Expand Down Expand Up @@ -96,8 +96,8 @@ path = "src/bin/snapshot_time.rs"
[features]

[dev-dependencies]
indoc = "1.0.3"
itertools = "0.10"
proptest = "1.0.0"
test-strategy = "0.2.0"
url = "2.2.2"
indoc = { workspace = true }
itertools = { workspace = true }
proptest = { workspace = true }
test-strategy = { workspace = true }
url = { workspace = true }
6 changes: 3 additions & 3 deletions concrete-iter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
syn = { version = "1.0.57", features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
quote = "1.0.8"
proc-macro2 = "1"
syn = { workspace = true, features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
quote = { workspace = true }
proc-macro2 = { workspace = true }

[lib]
proc-macro = true
24 changes: 12 additions & 12 deletions data-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
anyhow = "1.0.38"
bit-vec = { version = "0.6", features = ["serde"] }
chrono = "0.4.19"
anyhow = { workspace = true }
bit-vec = { workspace = true, features = ["serde"] }
chrono = { workspace = true }
eui48 = { workspace = true }
growable-bloom-filter = "2.0.1"
rand = "0.8.3"
rand_regex = "0.15.1"
rust_decimal = "1.26"
uuid = "0.8"
zipf = "7.0.0"
growable-bloom-filter = { workspace = true }
rand = { workspace = true }
rand_regex = { workspace = true }
rust_decimal = { workspace = true }
uuid = { workspace = true }
zipf = { workspace = true }

nom-sql = { path = "../nom-sql" }
readyset-data = { path = "../readyset-data/" }

[dev-dependencies]
test-strategy = "0.2.0"
proptest = "1.0.0"
test-strategy = { workspace = true }
proptest = { workspace = true }
mysql_async = { workspace = true }
tokio = { workspace = true, features = ["full"] }
serial_test = "0.5"
serial_test = { workspace = true }
test-utils = { path = "../test-utils" }
16 changes: 8 additions & 8 deletions database-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
derive_more = "0.99.17"
futures = "0.3.21"
derive_more = { workspace = true }
futures = { workspace = true }
mysql_async = { workspace = true }
native-tls = "0.2.8"
thiserror = "1.0.30"
native-tls = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tokio-postgres = { workspace = true, features = ["with-chrono-0_4"] }
postgres-native-tls = { workspace = true }
clap = { workspace = true, features = ["derive","env"] }
serde = { version = "1.0", features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
readyset-util = { path = "../readyset-util" }
readyset-errors = { path = "../readyset-errors" }
async-trait = "0.1"
async-trait = { workspace = true }
nom-sql = { path = "../nom-sql" }
deadpool-postgres = "0.10.3"
num_cpus = "1.15.0"
deadpool-postgres = { workspace = true }
num_cpus = { workspace = true }
22 changes: 11 additions & 11 deletions dataflow-expression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
edition = "2021"

[dependencies]
chrono = { version = "0.4.0", features = ["serde"] }
chrono-tz = { version = "0.8.6", features = ["serde"] }
serde = { version = "1.0.8", features = ["derive"] }
serde_json = { version = "1.0" }
rust_decimal = { version = "1.26" }
lazy_static = "1.4.0"
regex = "1.4.3"
itertools = "0.10.3"
vec1 = "1.6"
proptest = "1.0.0"
test-strategy = "0.2.0"
chrono = { workspace = true, features = ["serde"] }
chrono-tz = { workspace = true, features = ["serde"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
rust_decimal = { workspace = true }
lazy_static = { workspace = true }
regex = { workspace = true }
itertools = { workspace = true }
vec1 = { workspace = true }
proptest = { workspace = true }
test-strategy = { workspace = true }

# Local deps
readyset-util = { path = "../readyset-util" }
Expand Down
Loading

0 comments on commit 41fe772

Please sign in to comment.