diff --git a/Cargo.lock b/Cargo.lock index c21bd15f6..30c64d454 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,17 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -514,29 +503,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "borsh" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" -dependencies = [ - "borsh-derive", - "cfg_aliases 0.2.1", -] - -[[package]] -name = "borsh-derive" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "btoi" version = "0.4.3" @@ -558,28 +524,6 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bytecount" version = "0.6.8" @@ -660,12 +604,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "chrono" version = "0.4.38" @@ -1268,7 +1206,7 @@ dependencies = [ "mysql_async", "nom-sql", "partial-map", - "postgres", + "postgres 0.19.7 (git+https://github.com/readysettech/rust-postgres.git)", "proptest", "readyset-data", "readyset-errors", @@ -1287,7 +1225,7 @@ dependencies = [ name = "dataflow-state" version = "0.0.1" dependencies = [ - "ahash 0.8.11", + "ahash", "anyhow", "async-trait", "bincode", @@ -2085,9 +2023,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -2585,7 +2520,7 @@ version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ - "ahash 0.8.11", + "ahash", "indexmap 2.6.0", "is-terminal", "itoa", @@ -2969,7 +2904,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" dependencies = [ - "ahash 0.8.11", + "ahash", "portable-atomic", ] @@ -3290,7 +3225,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases", "libc", ] @@ -3828,9 +3763,22 @@ dependencies = [ [[package]] name = "postgres" -version = "0.19.9" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c918733159f4d55d2ceb262950f00b0aebd6af4aa97b5a47bb0655120475ed" +checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" +dependencies = [ + "bytes", + "fallible-iterator", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres" +version = "0.19.7" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ "bytes", "fallible-iterator", @@ -3842,8 +3790,8 @@ dependencies = [ [[package]] name = "postgres-derive" -version = "0.4.6" -source = "git+https://github.com/readysettech/rust-postgres.git?tag=readyset-20241114#34bf0f569a5a004097e926e6c630510ac3f4beb7" +version = "0.4.5" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ "heck", "proc-macro2", @@ -3854,10 +3802,8 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d442770e2b1e244bb5eb03b31c79b65bb2568f413b899eaba850fa945a65954" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ - "futures", "native-tls", "tokio", "tokio-native-tls", @@ -3866,8 +3812,8 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.7" -source = "git+https://github.com/readysettech/rust-postgres.git?tag=readyset-20241114#34bf0f569a5a004097e926e6c630510ac3f4beb7" +version = "0.6.6" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ "base64 0.22.1", "byteorder", @@ -3883,8 +3829,8 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.8" -source = "git+https://github.com/readysettech/rust-postgres.git?tag=readyset-20241114#34bf0f569a5a004097e926e6c630510ac3f4beb7" +version = "0.2.6" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ "bit-vec", "bytes", @@ -4108,7 +4054,7 @@ dependencies = [ "hmac", "nom", "nom-sql", - "postgres", + "postgres 0.19.7 (git+https://github.com/readysettech/rust-postgres.git)", "postgres-native-tls", "postgres-protocol", "postgres-types", @@ -4132,26 +4078,6 @@ dependencies = [ "uuid 0.8.2", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quanta" version = "0.12.3" @@ -4421,7 +4347,7 @@ dependencies = [ name = "readyset-adapter" version = "0.1.0" dependencies = [ - "ahash 0.8.11", + "ahash", "anyhow", "async-trait", "bincode", @@ -4520,7 +4446,7 @@ dependencies = [ name = "readyset-client" version = "0.7.0" dependencies = [ - "ahash 0.8.11", + "ahash", "anyhow", "array2", "async-bincode", @@ -4748,7 +4674,7 @@ dependencies = [ name = "readyset-dataflow" version = "0.7.0" dependencies = [ - "ahash 0.8.11", + "ahash", "anyhow", "async-bincode", "bincode", @@ -5233,7 +5159,7 @@ dependencies = [ "exponential-backoff", "fail", "futures", - "postgres", + "postgres 0.19.7 (git+https://github.com/readysettech/rust-postgres.git)", "pprof", "proptest", "rand", @@ -5343,15 +5269,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "replication-offset" version = "0.1.0" @@ -5485,35 +5402,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid 1.11.0", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rlimit" version = "0.10.2" @@ -5557,19 +5445,17 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c" dependencies = [ "arrayvec", - "borsh", + "byteorder", "bytes", "num-traits", - "postgres-types", - "rand", - "rkyv", + "postgres 0.19.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde", - "serde_json", + "tokio-postgres", ] [[package]] @@ -5800,12 +5686,6 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "security-framework" version = "2.11.1" @@ -6054,12 +5934,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - [[package]] name = "siphasher" version = "0.3.11" @@ -6701,8 +6575,8 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.12" -source = "git+https://github.com/readysettech/rust-postgres.git?tag=readyset-20241114#34bf0f569a5a004097e926e6c630510ac3f4beb7" +version = "0.7.10" +source = "git+https://github.com/readysettech/rust-postgres.git#0662ea1156c031dfac5f97cf7d5d2d2bcc249666" dependencies = [ "async-trait", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 5bf735081..76759688c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,5 @@ [patch.crates-io] -postgres-protocol = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } -postgres-types = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } -tokio-postgres = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } +tokio-postgres = { git = "https://github.com/readysettech/rust-postgres.git" } [workspace] members = [ @@ -73,9 +71,13 @@ consulrs = { git = "https://github.com/readysettech/consulrs.git", branch = "all mysql_async = { git = "https://github.com/readysettech/mysql_async" } -postgres-protocol = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } -postgres-types = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } -tokio-postgres = { git = "https://github.com/readysettech/rust-postgres.git", tag = "readyset-20241114" } +# only postgres-types and tokio-postgres are modified, but cargo misresolves dependencies of +# dependencies unless we force all of these to our forked repository +postgres = { git = "https://github.com/readysettech/rust-postgres.git" } +postgres-native-tls = { git = "https://github.com/readysettech/rust-postgres.git" } +postgres-protocol = { git = "https://github.com/readysettech/rust-postgres.git" } +postgres-types = { git = "https://github.com/readysettech/rust-postgres.git" } +tokio-postgres = { git = "https://github.com/readysettech/rust-postgres.git" } ######################## # STANDARD DEPENDENCIES @@ -143,7 +145,6 @@ indicatif = "0.17" indoc = "2.0.5" iter-enum = "1.1.3" itertools = "0.13.0" -jobserver = "0.1.32" lazy_static = "1.4.0" left-right = "0.11" libc = "0.2" @@ -170,8 +171,6 @@ parking_lot = "0.12.1" paste = "1.0.14" petgraph = "0.6" pin-project = "1.1" -postgres = "0.19.9" -postgres-native-tls = "0.5.0" pprof = "0.14" pratt = "0.4.0" pretty_assertions = "1.4.0" @@ -257,6 +256,7 @@ vmemcached = "0.5.0" walkdir = "2.5.0" xxhash-rust = { version = "0.8.10", features = ["xxh3"] } zipf = "7.0.1" +jobserver = "0.1.32" [profile.release] debug=true