diff --git a/Cargo.lock b/Cargo.lock index e7990f0ccb..fa84e68caa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2000,7 +2000,7 @@ dependencies = [ "indexmap", "slab", "tokio 0.2.22", - "tokio-util", + "tokio-util 0.3.1", "tracing", ] @@ -2894,12 +2894,25 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow", + "miow 0.2.1", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -2908,7 +2921,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -2923,6 +2936,16 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "miow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +dependencies = [ + "socket2", + "winapi 0.3.9", +] + [[package]] name = "native-tls" version = "0.2.4" @@ -3007,6 +3030,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-bigint" version = "0.3.0" @@ -3474,16 +3506,16 @@ checksum = "325a6d2ac5dee293c3b2612d4993b98aec1dff096b0a2dae70ed7d95784a05da" [[package]] name = "postgres" -version = "0.17.5" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d864cf6c2eabf1323afe4145ff273aad1898e4f2a3bcb30347715df8624a07" +checksum = "b25d05de0900dc0254bbad5e4b36b0f750c23ff44fbfcca4c1b9071f7ec1c764" dependencies = [ "bytes 0.5.6", "fallible-iterator", "futures 0.3.7", "log", - "tokio 0.2.22", - "tokio-postgres", + "tokio 0.3.0", + "tokio-postgres 0.6.0", ] [[package]] @@ -4544,11 +4576,11 @@ dependencies = [ [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi 0.3.9", @@ -5023,7 +5055,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", "futures 0.1.30", - "mio", + "mio 0.6.22", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -5052,7 +5084,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-uds", "num_cpus", "pin-project-lite", @@ -5066,6 +5098,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7137dbb0abee577362ccdc7df21605cfcbb949243aeab47dac9ea6ef7d830e21" dependencies = [ "bytes 0.5.6", + "futures-core", + "lazy_static", + "libc", + "memchr", + "mio 0.7.6", "pin-project-lite", "slab", ] @@ -5153,7 +5190,29 @@ dependencies = [ "postgres-protocol", "postgres-types", "tokio 0.2.22", - "tokio-util", + "tokio-util 0.3.1", +] + +[[package]] +name = "tokio-postgres" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "150d9be163b0df6dc185b8ee33bcb9a74865f0cad754495847f2e06e2051a345" +dependencies = [ + "async-trait", + "byteorder", + "bytes 0.5.6", + "fallible-iterator", + "futures 0.3.7", + "log", + "parking_lot 0.11.0", + "percent-encoding 2.1.0", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "tokio 0.3.0", + "tokio-util 0.4.0", ] [[package]] @@ -5166,7 +5225,7 @@ dependencies = [ "futures 0.1.30", "lazy_static", "log", - "mio", + "mio 0.6.22", "num_cpus", "parking_lot 0.9.0", "slab", @@ -5194,7 +5253,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.30", "iovec", - "mio", + "mio 0.6.22", "tokio-io", "tokio-reactor", ] @@ -5247,7 +5306,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.30", "log", - "mio", + "mio 0.6.22", "tokio-codec", "tokio-io", "tokio-reactor", @@ -5264,7 +5323,7 @@ dependencies = [ "iovec", "libc", "log", - "mio", + "mio 0.6.22", "mio-uds", "tokio-codec", "tokio-io", @@ -5285,6 +5344,20 @@ dependencies = [ "tokio 0.2.22", ] +[[package]] +name = "tokio-util" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24793699f4665ba0416ed287dc794fe6b11a4aa5e4e95b58624f45f6c46b97d4" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio 0.3.0", +] + [[package]] name = "toml" version = "0.5.7" @@ -5537,7 +5610,7 @@ dependencies = [ "surf", "tempfile", "tide", - "tokio-postgres", + "tokio-postgres 0.5.5", "tremor-common", "tremor-influx", "tremor-pipeline", diff --git a/Cargo.toml b/Cargo.toml index 91a1636d15..183371e0c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ hdrhistogram = "7" xz2 = "0.1" # postgres -postgres = {version = "0.17.5", features = ["with-serde_json-1", "with-chrono-0_4"]} +postgres = {version = "0.18.1", features = ["with-serde_json-1", "with-chrono-0_4"]} postgres-protocol = "0.5" tokio-postgres = "0.5"