Merge branch 'mz-0.7.2'

Author: benesch

README.md

@@ -1,46 +1,24 @@
-# Rust-Postgres
+# Materialize fork of Rust-Postgres
 
-PostgreSQL support for Rust.
+This repo serves as a staging area in order to develop and use features of the
+rust postgtres client before they are accepted upstream.
 
-## postgres [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
+Since development on this repo and the upstream one can happen in parallel this
+repo adops a branching strategy that keeps both in sync and keeps a tidy
+history. Importantly, the release branches are **never** forced-pushed so that
+older versions of materialize are always buildable.
 
-[Documentation](https://docs.rs/postgres)
+## Branching strategy
 
-A native, synchronous PostgreSQL client.
+For every upstream release a local `mz-{version}` branch is created. The latest
+such branch should be made the default branch of this repo in the Github
+settings.
 
-## tokio-postgres [![Latest Version](https://img.shields.io/crates/v/tokio-postgres.svg)](https://crates.io/crates/tokio-postgres)
+Whenever a PR is opened it should targed the current release branch (it should
+be picked automatically if its set as default on Github).
 
-[Documentation](https://docs.rs/tokio-postgres)
-
-A native, asynchronous PostgreSQL client.
-
-## postgres-types [![Latest Version](https://img.shields.io/crates/v/postgres-types.svg)](https://crates.io/crates/postgres-types)
-
-[Documentation](https://docs.rs/postgres-types)
-
-Conversions between Rust and Postgres types.
-
-## postgres-native-tls [![Latest Version](https://img.shields.io/crates/v/postgres-native-tls.svg)](https://crates.io/crates/postgres-native-tls)
-
-[Documentation](https://docs.rs/postgres-native-tls)
-
-TLS support for postgres and tokio-postgres via native-tls.
-
-## postgres-openssl [![Latest Version](https://img.shields.io/crates/v/postgres-openssl.svg)](https://crates.io/crates/postgres-openssl)
-
-[Documentation](https://docs.rs/postgres-openssl)
-
-TLS support for postgres and tokio-postgres via openssl.
-
-# Running test suite
-
-The test suite requires postgres to be running in the correct configuration. The easiest way to do this is with docker:
-
-1. Install `docker` and `docker-compose`.
-   1. On ubuntu: `sudo apt install docker.io docker-compose`.
-1. Make sure your user has permissions for docker.
-   1. On ubuntu: ``sudo usermod -aG docker $USER``
-1. Change to top-level directory of `rust-postgres` repo.
-1. Run `docker-compose up -d`.
-1. Run `cargo test`.
-1. Run `docker-compose stop`.
+Whenever a new version is created upstream a new `mz-{version}` branch on this
+repo is created, initially pointing at the release commit of the upstream repo.
+Then, all the fork-specific work is rebased on top of it. This process gives
+the opportunity to prune PRs that have successfully made it to the upstream
+repo and keep a clean per-version history.

codegen/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 
 [dependencies]
-phf_codegen = "0.8"
+phf_codegen = "0.10"
 regex = "1.0"
 marksman_escape = "0.1"
 linked-hash-map = "0.5"

codegen/src/sqlstate.rs

@@ -1,5 +1,4 @@
 use linked_hash_map::LinkedHashMap;
-use phf_codegen;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 
@@ -11,7 +10,9 @@ pub fn build() {
     let codes = parse_codes();
 
     make_type(&mut file);
+    make_code(&codes, &mut file);
     make_consts(&codes, &mut file);
+    make_inner(&codes, &mut file);
     make_map(&codes, &mut file);
 }
 
@@ -38,26 +39,51 @@ fn make_type(file: &mut BufWriter<File>) {
     write!(
         file,
         "// Autogenerated file - DO NOT EDIT
-use std::borrow::Cow;
 
 /// A SQLSTATE error code
 #[derive(PartialEq, Eq, Clone, Debug)]
-pub struct SqlState(Cow<'static, str>);
+pub struct SqlState(Inner);
 
 impl SqlState {{
     /// Creates a `SqlState` from its error code.
     pub fn from_code(s: &str) -> SqlState {{
         match SQLSTATE_MAP.get(s) {{
             Some(state) => state.clone(),
-            None => SqlState(Cow::Owned(s.to_string())),
+            None => SqlState(Inner::Other(s.into())),
         }}
     }}
+"
+    )
+    .unwrap();
+}
 
+fn make_code(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<File>) {
+    write!(
+        file,
+        r#"
     /// Returns the error code corresponding to the `SqlState`.
     pub fn code(&self) -> &str {{
-        &self.0
+        match &self.0 {{"#,
+    )
+    .unwrap();
+
+    for code in codes.keys() {
+        write!(
+            file,
+            r#"
+            Inner::E{code} => "{code}","#,
+            code = code,
+        )
+        .unwrap();
+    }
+
+    write!(
+        file,
+        r#"
+            Inner::Other(code) => code,
+        }}
     }}
-"
+        "#
     )
     .unwrap();
 }
@@ -69,7 +95,7 @@ fn make_consts(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<
                 file,
                 r#"
     /// {code}
-    pub const {name}: SqlState = SqlState(Cow::Borrowed("{code}"));
+    pub const {name}: SqlState = SqlState(Inner::E{code});
 "#,
                 name = name,
                 code = code,
@@ -81,6 +107,35 @@ fn make_consts(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<
     write!(file, "}}").unwrap();
 }
 
+fn make_inner(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<File>) {
+    write!(
+        file,
+        r#"
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+#[allow(clippy::upper_case_acronyms)]
+enum Inner {{"#,
+    )
+    .unwrap();
+    for code in codes.keys() {
+        write!(
+            file,
+            r#"
+    E{},"#,
+            code,
+        )
+        .unwrap();
+    }
+    write!(
+        file,
+        r#"
+    Other(Box<str>),
+}}
+        "#,
+    )
+    .unwrap();
+}
+
 fn make_map(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<File>) {
     let mut builder = phf_codegen::Map::new();
     for (code, names) in codes {

postgres-native-tls/src/lib.rs

@@ -51,7 +51,7 @@ use std::future::Future;
 use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+use tokio::io::{AsyncRead, AsyncWrite, BufReader, ReadBuf};
 use tokio_postgres::tls;
 #[cfg(feature = "runtime")]
 use tokio_postgres::tls::MakeTlsConnect;
@@ -115,6 +115,7 @@ where
     type Future = Pin<Box<dyn Future<Output = Result<TlsStream<S>, native_tls::Error>> + Send>>;
 
     fn connect(self, stream: S) -> Self::Future {
+        let stream = BufReader::with_capacity(8192, stream);
         let future = async move {
             let stream = self.connector.connect(&self.domain, stream).await?;
 
@@ -126,7 +127,7 @@ where
 }
 
 /// The stream returned by `TlsConnector`.
-pub struct TlsStream<S>(tokio_native_tls::TlsStream<S>);
+pub struct TlsStream<S>(tokio_native_tls::TlsStream<BufReader<S>>);
 
 impl<S> AsyncRead for TlsStream<S>
 where

postgres-openssl/src/lib.rs

@@ -57,7 +57,7 @@ use std::pin::Pin;
 #[cfg(feature = "runtime")]
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+use tokio::io::{AsyncRead, AsyncWrite, BufReader, ReadBuf};
 use tokio_openssl::SslStream;
 use tokio_postgres::tls;
 #[cfg(feature = "runtime")]
@@ -140,6 +140,7 @@ where
     type Future = Pin<Box<dyn Future<Output = Result<TlsStream<S>, Self::Error>> + Send>>;
 
     fn connect(self, stream: S) -> Self::Future {
+        let stream = BufReader::with_capacity(8192, stream);
         let future = async move {
             let ssl = self.ssl.into_ssl(&self.domain)?;
             let mut stream = SslStream::new(ssl, stream)?;
@@ -182,7 +183,7 @@ impl Error for ConnectError {
 }
 
 /// The stream returned by `TlsConnector`.
-pub struct TlsStream<S>(SslStream<S>);
+pub struct TlsStream<S>(SslStream<BufReader<S>>);
 
 impl<S> AsyncRead for TlsStream<S>
 where

postgres-protocol/Cargo.toml

@@ -13,9 +13,9 @@ base64 = "0.13"
 byteorder = "1.0"
 bytes = "1.0"
 fallible-iterator = "0.2"
-hmac = "0.10"
-md-5 = "0.9"
+hmac = "0.12"
+md-5 = "0.10.0"
 memchr = "2.0"
 rand = "0.8"
-sha2 = "0.9"
+sha2 = "0.10.0"
 stringprep = "0.1"

postgres-protocol/src/authentication/sasl.rs

@@ -1,6 +1,6 @@
 //! SASL-based authentication support.
 
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use rand::{self, Rng};
 use sha2::digest::FixedOutput;
 use sha2::{Digest, Sha256};
@@ -33,15 +33,16 @@ fn normalize(pass: &[u8]) -> Vec<u8> {
 }
 
 pub(crate) 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");
+    let mut hmac =
+        Hmac::<Sha256>::new_from_slice(str).expect("HMAC is able to accept all key sizes");
     hmac.update(salt);
     hmac.update(&[0, 0, 0, 1]);
     let mut prev = hmac.finalize().into_bytes();
 
     let mut hi = prev;
 
     for _ in 1..i {
-        let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("already checked above");
+        let mut hmac = Hmac::<Sha256>::new_from_slice(str).expect("already checked above");
         hmac.update(&prev);
         prev = hmac.finalize().into_bytes();
 
@@ -195,7 +196,7 @@ impl ScramSha256 {
 
         let salted_password = hi(&password, &salt, parsed.iteration_count);
 
-        let mut hmac = Hmac::<Sha256>::new_varkey(&salted_password)
+        let mut hmac = Hmac::<Sha256>::new_from_slice(&salted_password)
             .expect("HMAC is able to accept all key sizes");
         hmac.update(b"Client Key");
         let client_key = hmac.finalize().into_bytes();
@@ -214,8 +215,8 @@ impl ScramSha256 {
 
         let auth_message = format!("n=,r={},{},{}", client_nonce, message, self.message);
 
-        let mut hmac =
-            Hmac::<Sha256>::new_varkey(&stored_key).expect("HMAC is able to accept all key sizes");
+        let mut hmac = Hmac::<Sha256>::new_from_slice(&stored_key)
+            .expect("HMAC is able to accept all key sizes");
         hmac.update(auth_message.as_bytes());
         let client_signature = hmac.finalize().into_bytes();
 
@@ -266,15 +267,15 @@ impl ScramSha256 {
             Err(e) => return Err(io::Error::new(io::ErrorKind::InvalidInput, e)),
         };
 
-        let mut hmac = Hmac::<Sha256>::new_varkey(&salted_password)
+        let mut hmac = Hmac::<Sha256>::new_from_slice(&salted_password)
             .expect("HMAC is able to accept all key sizes");
         hmac.update(b"Server Key");
         let server_key = hmac.finalize().into_bytes();
 
-        let mut hmac =
-            Hmac::<Sha256>::new_varkey(&server_key).expect("HMAC is able to accept all key sizes");
+        let mut hmac = Hmac::<Sha256>::new_from_slice(&server_key)
+            .expect("HMAC is able to accept all key sizes");
         hmac.update(auth_message.as_bytes());
-        hmac.verify(&verifier)
+        hmac.verify(verifier.as_slice().into())
             .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "SCRAM verification error"))
     }
 }

postgres-protocol/src/password/mod.rs

@@ -7,7 +7,7 @@
 //! end up in logs pg_stat displays, etc.
 
 use crate::authentication::sasl;
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use md5::Md5;
 use rand::RngCore;
 use sha2::digest::FixedOutput;
@@ -61,8 +61,8 @@ pub(crate) fn scram_sha_256_salt(password: &[u8], salt: [u8; SCRAM_DEFAULT_SALT_
     let salted_password = sasl::hi(&prepared, &salt, SCRAM_DEFAULT_ITERATIONS);
 
     // client key
-    let mut hmac =
-        Hmac::<Sha256>::new_varkey(&salted_password).expect("HMAC is able to accept all key sizes");
+    let mut hmac = Hmac::<Sha256>::new_from_slice(&salted_password)
+        .expect("HMAC is able to accept all key sizes");
     hmac.update(b"Client Key");
     let client_key = hmac.finalize().into_bytes();
 
@@ -72,8 +72,8 @@ pub(crate) fn scram_sha_256_salt(password: &[u8], salt: [u8; SCRAM_DEFAULT_SALT_
     let stored_key = hash.finalize_fixed();
 
     // server key
-    let mut hmac =
-        Hmac::<Sha256>::new_varkey(&salted_password).expect("HMAC is able to accept all key sizes");
+    let mut hmac = Hmac::<Sha256>::new_from_slice(&salted_password)
+        .expect("HMAC is able to accept all key sizes");
     hmac.update(b"Server Key");
     let server_key = hmac.finalize().into_bytes();