Merge latest master into branch

Author: colingm

.circleci/config.yml

@@ -22,7 +22,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.39.0
+      - image: rust:1.40.0
         environment:
           RUSTFLAGS: -D warnings
       - image: sfackler/rust-postgres-test:6

postgres-derive/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
-## v0.1.0-alpha.1 - 2019-10-14
+## v0.4.0 - 2019-12-23
+
+No changes
+
+## v0.4.0-alpha.1 - 2019-10-14
 
 * Initial release

postgres-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-derive"
-version = "0.4.0-alpha.1"
+version = "0.4.0"
 authors = ["Steven Fackler <sfackler@palantir.com>"]
 license = "MIT/Apache-2.0"
 edition = "2018"

postgres-native-tls/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.3.0 - 2019-12-23
+
+### Changed
+
+* Upgraded to `tokio-postgres` 0.5.
+
 ## v0.3.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-native-tls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-native-tls"
-version = "0.3.0-alpha.2"
+version = "0.3.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -21,8 +21,8 @@ futures = "0.3"
 native-tls = "0.2"
 tokio = "0.2"
 tokio-tls = "0.3"
-tokio-postgres = { version = "=0.5.0-alpha.2", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.5.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["full"] }
-postgres = { version = "=0.17.0-alpha.2", path = "../postgres" }
+postgres = { version = "0.17.0", path = "../postgres" }

postgres-openssl/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.3.0 - 2019-12-23
+
+### Changed
+
+* Upgraded to `tokio-postgres` 0.5.
+
 ## v0.3.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-openssl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-openssl"
-version = "0.3.0-alpha.2"
+version = "0.3.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -21,8 +21,8 @@ futures = "0.3"
 openssl = "0.10"
 tokio = "0.2"
 tokio-openssl = "0.4"
-tokio-postgres = { version = "=0.5.0-alpha.2", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.5.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["full"] }
-postgres = { version = "=0.17.0-alpha.2", path = "../postgres" }
+postgres = { version = "0.17.0", path = "../postgres" }

postgres-protocol/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.5.0 - 2019-12-23
+
+### Changed
+
+* `frontend::Message` is now a true non-exhaustive enum.
+
 ## v0.5.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-protocol/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
 name = "postgres-protocol"
-version = "0.5.0-alpha.2"
+version = "0.5.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 description = "Low level Postgres protocol APIs"
 license = "MIT/Apache-2.0"
-repository = "https://github.com/sfackler/rust-postgres-protocol"
+repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
 
 [dependencies]
-base64 = "0.10"
+base64 = "0.11"
 byteorder = "1.0"
 bytes = "0.5"
 fallible-iterator = "0.2"
-generic-array = "0.13"
 hmac = "0.7"
-md5 = "0.6"
+md5 = "0.7"
 memchr = "2.0"
 rand = "0.7"
 sha2 = "0.8"

postgres-protocol/src/authentication/sasl.rs

@@ -1,7 +1,5 @@
 //! SASL-based authentication support.
 
-use generic_array::typenum::U32;
-use generic_array::GenericArray;
 use hmac::{Hmac, Mac};
 use rand::{self, Rng};
 use sha2::{Digest, Sha256};
@@ -33,13 +31,13 @@ fn normalize(pass: &[u8]) -> Vec<u8> {
     }
 }
 
-fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
+fn hi(str: &[u8], salt: &[u8], i: u32) -> [u8; 32] {
     let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("HMAC is able to accept all key sizes");
     hmac.input(salt);
     hmac.input(&[0, 0, 0, 1]);
     let mut prev = hmac.result().code();
 
-    let mut hi = GenericArray::<u8, U32>::clone_from_slice(&prev);
+    let mut hi = prev;
 
     for _ in 1..i {
         let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("already checked above");
@@ -51,7 +49,7 @@ fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
         }
     }
 
-    hi
+    hi.into()
 }
 
 enum ChannelBindingInner {
@@ -103,7 +101,7 @@ enum State {
         channel_binding: ChannelBinding,
     },
     Finish {
-        salted_password: GenericArray<u8, U32>,
+        salted_password: [u8; 32],
         auth_message: String,
     },
     Done,
@@ -220,7 +218,7 @@ impl ScramSha256 {
         hmac.input(auth_message.as_bytes());
         let client_signature = hmac.result();
 
-        let mut client_proof = GenericArray::<u8, U32>::clone_from_slice(&client_key);
+        let mut client_proof = client_key;
         for (proof, signature) in client_proof.iter_mut().zip(client_signature.code()) {
             *proof ^= signature;
         }

postgres-protocol/src/message/backend.rs

@@ -72,6 +72,7 @@ impl Header {
 }
 
 /// An enum representing Postgres backend messages.
+#[non_exhaustive]
 pub enum Message {
     AuthenticationCleartextPassword,
     AuthenticationGss,
@@ -104,8 +105,6 @@ pub enum Message {
     PortalSuspended,
     ReadyForQuery(ReadyForQueryBody),
     RowDescription(RowDescriptionBody),
-    #[doc(hidden)]
-    __ForExtensibility,
 }
 
 impl Message {

postgres-types/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## v0.1.0 - 2019-12-23
+
+### Changed
+
+* `Kind` is now a true non-exhaustive enum.
+
+### Removed
+
+* Removed `uuid` 0.7 support.
+
+### Added
+
+* Added a `Hash` implementation for `Type`.
+
 ## v0.1.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-types"
-version = "0.1.0-alpha.2"
+version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -22,8 +22,8 @@ with-uuid-0_8 = ["uuid-08"]
 [dependencies]
 bytes = "0.5"
 fallible-iterator = "0.2"
-postgres-protocol = { version = "=0.5.0-alpha.2", path = "../postgres-protocol" }
-postgres-derive = { version = "=0.4.0-alpha.1", optional = true, path = "../postgres-derive" }
+postgres-protocol = { version = "0.5.0", path = "../postgres-protocol" }
+postgres-derive = { version = "0.4.0", optional = true, path = "../postgres-derive" }
 
 bit-vec-06 = { version = "0.6", package = "bit-vec", optional = true }
 chrono-04 = { version = "0.4", package = "chrono", optional = true }

postgres-types/src/lib.rs

@@ -263,6 +263,7 @@ impl Type {
 
 /// Represents the kind of a Postgres type.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[non_exhaustive]
 pub enum Kind {
     /// A simple type like `VARCHAR` or `INTEGER`.
     Simple,
@@ -278,8 +279,6 @@ pub enum Kind {
     Domain(Type),
     /// A composite type along with information about its fields.
     Composite(Vec<Field>),
-    #[doc(hidden)]
-    __ForExtensibility,
 }
 
 /// Information about a field of a composite type.

postgres/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## v0.17.0 - 2019-12-23
+
+### Changed
+
+* Each `Client` now has its own non-threaded tokio `Runtime` rather than sharing a global threaded `Runtime`. This
+    significantly improves performance by minimizing context switches and cross-thread synchronization.
+* `Client::copy_in` now returns a writer rather than taking in a reader.
+* `Client::query_raw` now returns a named type.
+* `Client::copy_in` and `Client::copy_out` no longer take query parameters as PostgreSQL doesn't support them in COPY
+    queries.
+    
+### Removed
+
+* Removed support for `uuid` 0.7.
+
+### Added
+
+* Added `Client::query_opt` for queries that are expected to return zero or one rows.
+* Added binary copy support in the `binary_copy` module.
+* The `fallible-iterator` crate is now publicly reexported.
+
 ## v0.17.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres"
-version = "0.17.0-alpha.2"
+version = "0.17.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -32,11 +32,10 @@ with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
 bytes = "0.5"
 fallible-iterator = "0.2"
 futures = "0.3"
-tokio-postgres = { version = "=0.5.0-alpha.2", path = "../tokio-postgres" }
+tokio-postgres = { version = "0.5.0", path = "../tokio-postgres" }
 
 tokio = { version = "0.2", features = ["rt-core"] }
 log = "0.4"
 
 [dev-dependencies]
 criterion = "0.3"
-tokio = "0.2"

postgres/src/cancel_token.rs

@@ -0,0 +1,36 @@
+use tokio::runtime;
+use tokio_postgres::tls::MakeTlsConnect;
+use tokio_postgres::{Error, Socket};
+
+/// The capability to request cancellation of in-progress queries on a
+/// connection.
+#[derive(Clone)]
+pub struct CancelToken(tokio_postgres::CancelToken);
+
+impl CancelToken {
+    pub(crate) fn new(inner: tokio_postgres::CancelToken) -> CancelToken {
+        CancelToken(inner)
+    }
+
+    /// Attempts to cancel the in-progress query on the connection associated
+    /// with this `CancelToken`.
+    ///
+    /// The server provides no information about whether a cancellation attempt was successful or not. An error will
+    /// only be returned if the client was unable to connect to the database.
+    ///
+    /// Cancellation is inherently racy. There is no guarantee that the
+    /// cancellation request will reach the server before the query terminates
+    /// normally, or that the connection associated with this token is still
+    /// active.
+    pub fn cancel_query<T>(&self, tls: T) -> Result<(), Error>
+    where
+        T: MakeTlsConnect<Socket>,
+    {
+        runtime::Builder::new()
+            .enable_all()
+            .basic_scheduler()
+            .build()
+            .unwrap() // FIXME don't unwrap
+            .block_on(self.0.cancel_query(tls))
+    }
+}

postgres/src/client.rs

@@ -1,6 +1,6 @@
 use crate::{
-    Config, CopyInWriter, CopyOutReader, GenericConnection, RowIter, Statement, ToStatement,
-    Transaction,
+    CancelToken, Config, CopyInWriter, CopyOutReader, GenericConnection, RowIter, Statement,
+    ToStatement, Transaction,
 };
 use std::ops::{Deref, DerefMut};
 use tokio::runtime::Runtime;
@@ -446,6 +446,46 @@ impl Client {
         Ok(Transaction::new(&mut self.runtime, transaction))
     }
 
+    /// Constructs a cancellation token that can later be used to request
+    /// cancellation of a query running on this connection.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use postgres::{Client, NoTls};
+    /// use postgres::error::SqlState;
+    /// use std::thread;
+    /// use std::time::Duration;
+    ///
+    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
+    /// let mut client = Client::connect("host=localhost user=postgres", NoTls)?;
+    ///
+    /// let cancel_token = client.cancel_token();
+    ///
+    /// thread::spawn(move || {
+    ///     // Abort the query after 5s.
+    ///     thread::sleep(Duration::from_secs(5));
+    ///     cancel_token.cancel_query(NoTls);
+    /// });
+    ///
+    /// match client.simple_query("SELECT long_running_query()") {
+    ///     Err(e) if e.code() == Some(&SqlState::QUERY_CANCELED) => {
+    ///         // Handle canceled query.
+    ///     }
+    ///     Err(err) => return Err(err.into()),
+    ///     Ok(rows) => {
+    ///         // ...
+    ///     }
+    /// }
+    /// // ...
+    ///
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn cancel_token(&self) -> CancelToken {
+        CancelToken::new(self.client.cancel_token())
+    }
+
     /// Determines if the client's connection has already closed.
     ///
     /// If this returns `true`, the client is no longer usable.