diff --git a/Cargo.lock b/Cargo.lock index 4cfe3935ab..d69b4af76e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -655,6 +655,12 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "bzip2" version = "0.3.3" @@ -1945,6 +1951,17 @@ dependencies = [ "wasi 0.9.0+wasi-snapshot-preview1", ] +[[package]] +name = "getrandom" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +] + [[package]] name = "ghash" version = "0.3.0" @@ -3457,16 +3474,16 @@ checksum = "325a6d2ac5dee293c3b2612d4993b98aec1dff096b0a2dae70ed7d95784a05da" [[package]] name = "postgres" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25d05de0900dc0254bbad5e4b36b0f750c23ff44fbfcca4c1b9071f7ec1c764" +checksum = "0f853fba627ed1f21392d329eeb03caf90dce57a65dfbd24274f4c39452ed3bb" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.0", "fallible-iterator", "futures 0.3.8", "log", - "tokio 0.3.5", - "tokio-postgres", + "tokio 1.0.1", + "tokio-postgres 0.7.0", ] [[package]] @@ -3487,6 +3504,24 @@ dependencies = [ "stringprep", ] +[[package]] +name = "postgres-protocol" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e34ad3dc5c56d036b9418185ee97e14b6766d55c8ccf9dc18302ad4e6371d9" +dependencies = [ + "base64 0.13.0", + "byteorder", + "bytes 1.0.0", + "fallible-iterator", + "hmac 0.10.1", + "md5", + "memchr", + "rand 0.8.1", + "sha2", + "stringprep", +] + [[package]] name = "postgres-types" version = "0.1.3" @@ -3494,9 +3529,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfc08a7d94a80665de4a83942fa8db2fdeaf2f123fc0535e384dc4fff251efae" dependencies = [ "bytes 0.5.6", + "fallible-iterator", + "postgres-protocol 0.5.3", +] + +[[package]] +name = "postgres-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493d9d4613b88b12433aa12890e74e74cd93fdc1e08b7c2aed4768aaae8414c" +dependencies = [ + "bytes 1.0.0", "chrono", "fallible-iterator", - "postgres-protocol", + "postgres-protocol 0.6.0", "serde", "serde_json", ] @@ -3683,7 +3729,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.15", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -3691,6 +3737,18 @@ dependencies = [ "rand_pcg 0.2.1", ] +[[package]] +name = "rand" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.1", + "rand_hc 0.3.0", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -3711,6 +3769,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.1", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -3732,7 +3800,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.15", +] + +[[package]] +name = "rand_core" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +dependencies = [ + "getrandom 0.2.1", ] [[package]] @@ -3753,6 +3830,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.1", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -3904,7 +3990,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", + "getrandom 0.1.15", "redox_syscall", "rust-argon2", ] @@ -5073,6 +5159,20 @@ dependencies = [ "slab", ] +[[package]] +name = "tokio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd" +dependencies = [ + "autocfg 1.0.1", + "bytes 1.0.0", + "libc", + "memchr", + "mio 0.7.6", + "pin-project-lite 0.2.1", +] + [[package]] name = "tokio-buf" version = "0.1.1" @@ -5153,12 +5253,35 @@ dependencies = [ "percent-encoding 2.1.0", "phf", "pin-project-lite 0.1.11", - "postgres-protocol", - "postgres-types", + "postgres-protocol 0.5.3", + "postgres-types 0.1.3", "tokio 0.3.5", "tokio-util 0.4.0", ] +[[package]] +name = "tokio-postgres" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc9f82c2bfb06a33dd0dfb44b07ca98fe72df19e681d80c78d05a1bac2138e2" +dependencies = [ + "async-trait", + "byteorder", + "bytes 1.0.0", + "fallible-iterator", + "futures 0.3.8", + "log", + "parking_lot 0.11.1", + "percent-encoding 2.1.0", + "phf", + "pin-project-lite 0.2.1", + "postgres-protocol 0.6.0", + "postgres-types 0.2.0", + "socket2", + "tokio 1.0.1", + "tokio-util 0.6.0", +] + [[package]] name = "tokio-reactor" version = "0.1.12" @@ -5178,6 +5301,17 @@ dependencies = [ "tokio-sync", ] +[[package]] +name = "tokio-stream" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.1", + "tokio 1.0.1", +] + [[package]] name = "tokio-sync" version = "0.1.8" @@ -5302,6 +5436,21 @@ dependencies = [ "tokio 0.3.5", ] +[[package]] +name = "tokio-util" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36135b7e7da911f5f8b9331209f7fab4cc13498f3fff52f72a710c78187e3148" +dependencies = [ + "bytes 1.0.0", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.1", + "tokio 1.0.1", + "tokio-stream", +] + [[package]] name = "toml" version = "0.5.7" @@ -5543,7 +5692,7 @@ dependencies = [ "matches", "pin-project-lite 0.2.1", "postgres", - "postgres-protocol", + "postgres-protocol 0.5.3", "pretty_assertions", "rand 0.7.3", "rdkafka", @@ -5561,7 +5710,7 @@ dependencies = [ "surf", "tempfile", "tide", - "tokio-postgres", + "tokio-postgres 0.6.0", "tremor-common", "tremor-influx", "tremor-pipeline", diff --git a/Cargo.toml b/Cargo.toml index a1ccb2df38..f0f35b15d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ hdrhistogram = "7" xz2 = "0.1" # postgres -postgres = {version = "0.18.1", features = ["with-serde_json-1", "with-chrono-0_4"]} +postgres = {version = "0.19.0", features = ["with-serde_json-1", "with-chrono-0_4"]} postgres-protocol = "0.5" tokio-postgres = "0.6"