Merge pull request #324 from blackbeam/version-0.35.0

Prepare version 0.35.0

Author: blackbeam

Cargo.toml

@@ -21,7 +21,7 @@ futures-util = "0.3"
 futures-sink = "0.3"
 keyed_priority_queue = "0.4"
 lru = "0.12.0"
-mysql_common = { version = "0.33", default-features = false }
+mysql_common = { version = "0.34", default-features = false }
 pem = "3.0"
 percent-encoding = "2.1.0"
 pin-project = "1.0.2"
@@ -35,7 +35,7 @@ tokio-util = { version = "0.7.2", features = ["codec", "io"] }
 tracing = { version = "0.1.37", default-features = false, features = [
     "attributes",
 ], optional = true }
-twox-hash = "2"
+twox-hash = { version = "2", default-features = false, features = ["xxhash64"] }
 url = "2.1"
 hdrhistogram = { version = "7.5", optional = true }
 
@@ -55,6 +55,7 @@ optional = true
 [dependencies.rustls]
 version = "0.23"
 default-features = false
+features = ["std"]
 optional = true
 
 [dependencies.rustls-pemfile]
@@ -77,36 +78,16 @@ socket2 = { version = "0.5.2", features = ["all"] }
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread"] }
 
 [features]
-default = [
-    "flate2/zlib",
-    "bigdecimal",
-    "rust_decimal",
-    "time",
-    "frunk",
-    "derive",
-    "native-tls-tls",
-    "binlog",
-]
+default = ["flate2/zlib", "derive"]
 
-default-rustls = [
-    "default-rustls-no-provider",
-    "aws-lc-rs",
-]
+default-rustls = ["default-rustls-no-provider", "aws-lc-rs"]
 
-default-rustls-ring = [
-    "default-rustls-no-provider",
-    "ring",
-]
+default-rustls-ring = ["default-rustls-no-provider", "ring"]
 
 default-rustls-no-provider = [
     "flate2/rust_backend",
-    "bigdecimal",
-    "rust_decimal",
-    "time",
-    "frunk",
     "derive",
     "rustls-tls",
-    "binlog",
     "tls12",
 ]
 

README.md

@@ -20,8 +20,10 @@ mysql_async = "<desired version>"
 
 ## Crate Features
 
-Default feature set is wide – it includes all default [`mysql_common` features][myslqcommonfeatures]
-as well as `native-tls`-based TLS support.
+By default there are only two features enabled:
+
+*   `flate2/zlib` — choosing flate2 backend is mandatory
+*   `derive` — see ["Derive Macros" section in `mysql_common` docs][mysqlcommonderive]
 
 ### List Of Features
 
@@ -37,21 +39,18 @@ as well as `native-tls`-based TLS support.
     mysql_async = { version = "*", default-features = false, features = ["minimal"]}
     ```
 
-*   `minimal-rust` - same as `minimal` but rust-based flate2 backend is chosen. Enables:
+*   `minimal-rust` - same as `minimal` but with rust-based flate2 backend. Enables:
 
     -    `flate2/rust_backend`
 
 *   `default` – enables the following set of features:
 
-    -   `minimal`
-    -   `native-tls-tls`
-    -   `bigdecimal`
-    -   `rust_decimal`
-    -   `time`
-    -   `frunk`
-    -   `binlog`
+    -   `flate2/zlib`
+    -   `derive`
+
+*   `default-rustls` – default set of features with TLS via `rustls/aws-lc-rs`
 
-*   `default-rustls` – same as default but with `rustls-tls` instead of `native-tls-tls`.
+*   `default-rustls-ring` – default set of features with TLS via `rustls/ring`
 
     **Example:**
 
@@ -60,21 +59,22 @@ as well as `native-tls`-based TLS support.
     mysql_async = { version = "*", default-features = false, features = ["default-rustls"] }
     ```
 
-*   `native-tls-tls` – enables `native-tls`-based TLS support _(conflicts with `rustls-tls`)_
+*   `native-tls-tls` – enables TLS via `native-tls`
 
     **Example:**
 
     ```toml
     [dependencies]
-    mysql_async = { version = "*", default-features = false, features = ["native-tls-tls"] }
+    mysql_async = { version = "*", default-features = false, features = ["minimal", "native-tls-tls"] }
 
-*   `rustls-tls` – enables `native-tls`-based TLS support _(conflicts with `native-tls-tls`)_
+*   `rustls-tls` - enables rustls TLS backend with no provider. You should enable one
+    of existing providers using `aws-lc-rs` or `ring` features:
 
     **Example:**
 
     ```toml
     [dependencies]
-    mysql_async = { version = "*", default-features = false, features = ["rustls-tls"] }
+    mysql_async = { version = "*", default-features = false, features = ["minimal-rust", "rustls-tls", "ring"] }
 
 *   `tracing` – enables instrumentation via `tracing` package.
 
@@ -94,7 +94,7 @@ as well as `native-tls`-based TLS support.
 
     -   `mysql_common/binlog"
 
-#### Proxied features
+#### Proxied features (see [`mysql_common`` fatures][myslqcommonfeatures])
 
 *   `derive` – enables `mysql_common/derive` feature
 *   `chrono` = enables `mysql_common/chrono` feature
@@ -104,6 +104,7 @@ as well as `native-tls`-based TLS support.
 *   `frunk` = enables `mysql_common/frunk` feature
 
 [myslqcommonfeatures]: https://github.com/blackbeam/rust_mysql_common#crate-features
+[mysqlcommonderive]: https://github.com/blackbeam/rust_mysql_common?tab=readme-ov-file#derive-macros
 
 ## TLS/SSL Support
 

azure-pipelines.yml

@@ -41,13 +41,15 @@ jobs:
       - bash: |
           cargo +nightly build -Zfeatures=dev_dep
           SSL=false COMPRESS=false cargo test
-          SSL=true COMPRESS=false cargo test
+          SSL=true COMPRESS=false cargo test --features native-tls-tls
           SSL=false COMPRESS=true cargo test
-          SSL=true COMPRESS=true cargo test
-          SSL=true COMPRESS=false cargo test --no-default-features --features default-rustls
+          SSL=true COMPRESS=true cargo test --features rustls-tls,ring
 
+          SSL=true COMPRESS=false cargo check --no-default-features --features default-rustls
+          SSL=true COMPRESS=false cargo check --no-default-features --features default-rustls-ring
           SSL=true COMPRESS=false cargo check --no-default-features --features minimal
           SSL=true COMPRESS=false cargo check --no-default-features --features minimal-rust
+          SSL=true COMPRESS=false cargo check --no-default-features --features minimal,tracing
         env:
           RUST_BACKTRACE: 1
           DATABASE_URL: mysql://root:[email protected]:3306/mysql
@@ -82,9 +84,8 @@ jobs:
         displayName: Install Rust (Windows)
       - bash: |
           SSL=false COMPRESS=false cargo test
-          SSL=true COMPRESS=false cargo test
+          SSL=true COMPRESS=false cargo test --features native-tls-tls
           SSL=false COMPRESS=true cargo test
-          SSL=true COMPRESS=true cargo test
         env:
           RUST_BACKTRACE: 1
           DATABASE_URL: mysql://root:[email protected]/mysql
@@ -96,6 +97,12 @@ jobs:
     strategy:
       maxParallel: 10
       matrix:
+        v91:
+          DB_VERSION: "9.1"
+        v90:
+          DB_VERSION: "9.0"
+        v84:
+          DB_VERSION: "8.4"
         v80:
           DB_VERSION: "8.0-debian"
         v57:
@@ -126,12 +133,19 @@ jobs:
           docker exec container bash -l -c "apt-get --allow-unauthenticated -y update"
           docker exec container bash -l -c "apt-get install -y curl clang libssl-dev pkg-config build-essential"
           docker exec container bash -l -c "curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable"
-        displayName: Install Rust in docker
+        displayName: Install Rust in docker (Debian)
+        condition: or(eq(variables['DB_VERSION'], '5.6'), eq(variables['DB_VERSION'], '5.7-debian'), eq(variables['DB_VERSION'], '8.0-debian'))
+      - bash: |
+          docker exec container bash -l -c "microdnf install dnf"
+          docker exec container bash -l -c "dnf group install \"Development Tools\""
+          docker exec container bash -l -c "curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable"
+        displayName: Install Rust in docker (RedHat)
+        condition: not(or(eq(variables['DB_VERSION'], '5.6'), eq(variables['DB_VERSION'], '5.7-debian'), eq(variables['DB_VERSION'], '8.0-debian')))
       - bash: |
           if [[ "5.6" != "$(DB_VERSION)" ]]; then SSL=true; else DATABASE_URL="mysql://root2:[email protected]/mysql?secure_auth=false"; fi
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
-          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL cargo test"
+          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL cargo test --features native-tls-tls"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL COMPRESS=true cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL COMPRESS=true cargo test --no-default-features --features default-rustls"
         env:
@@ -145,16 +159,16 @@ jobs:
     strategy:
       maxParallel: 10
       matrix:
+        v1162:
+          DB_VERSION: "11.6.2"
+        v1152:
+          DB_VERSION: "11.5.2"
+        v1144:
+          DB_VERSION: "11.4.2"
         v113:
-          DB_VERSION: "11.3"
+          DB_VERSION: "11.3.2"
         v1011:
-          DB_VERSION: "10.11"
-        v106:
-          DB_VERSION: "10.6"
-        v105:
-          DB_VERSION: "10.5"
-        v104:
-          DB_VERSION: "10.4"
+          DB_VERSION: "10.11.10"
     steps:
       - bash: |
           sudo apt-get update
@@ -194,7 +208,7 @@ jobs:
       - bash: |
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
-          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test"
+          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --features native-tls-tls"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true COMPRESS=true cargo test"
           if [[ "10.1" != "$(DB_VERSION)" ]]; then docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --no-default-features --features default-rustls"; fi
         env:
@@ -207,10 +221,14 @@ jobs:
       vmImage: "ubuntu-latest"
     strategy:
       matrix:
-        v5.3.0:
-          DB_VERSION: "v5.3.0"
-        v5.0.6:
-          DB_VERSION: "v5.0.6"
+        v8.5.0:
+          DB_VERSION: "v8.5.0"
+        v7.6.0:
+          DB_VERSION: "v7.6.0"
+        v6.6.0:
+          DB_VERSION: "v6.6.0"
+        v5.4.3:
+          DB_VERSION: "v5.4.3"
     steps:
       - bash: |
           curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh

src/conn/mod.rs

@@ -504,10 +504,7 @@ impl Conn {
         self.inner.capabilities = handshake.capabilities() & self.inner.opts.get_capabilities();
         self.inner.version = handshake
             .maria_db_server_version_parsed()
-            .map(|version| {
-                self.inner.is_mariadb = true;
-                version
-            })
+            .inspect(|_| self.inner.is_mariadb = true)
             .or_else(|| handshake.server_version_parsed())
             .unwrap_or((0, 0, 0));
         self.inner.id = handshake.connection_id();
@@ -982,7 +979,7 @@ impl Conn {
     /// Configures the connection based on server settings. In particular:
     ///
     /// * It reads and stores socket address inside the connection unless if socket address is
-    /// already in [`Opts`] or if `prefer_socket` is `false`.
+    ///   already in [`Opts`] or if `prefer_socket` is `false`.
     ///
     /// * It reads and stores `max_allowed_packet` in the connection unless it's already in [`Opts`]
     ///
@@ -1420,7 +1417,7 @@ mod test {
         for (plug, val, pass) in variants {
             dbg!((plug, val, pass, conn.inner.version));
 
-            if plug == "mysql_native_password" && conn.inner.version >= (9, 0, 0) {
+            if plug == "mysql_native_password" && conn.inner.version >= (8, 4, 0) {
                 continue;
             }
 
@@ -1429,7 +1426,7 @@ mod test {
             let query = format!("CREATE USER 'test_user'@'%' IDENTIFIED WITH {}", plug);
             conn.query_drop(query).await.unwrap();
 
-            if conn.inner.version <= (8, 0, 11) {
+            if conn.inner.version < (8, 0, 11) {
                 conn.query_drop(format!("SET old_passwords = {}", val))
                     .await
                     .unwrap();
@@ -1572,7 +1569,7 @@ mod test {
         };
 
         for (i, plugin) in plugins.iter().enumerate() {
-            if *plugin == "mysql_native_password" && conn.server_version() >= (9, 0, 0) {
+            if *plugin == "mysql_native_password" && conn.server_version() >= (8, 4, 0) {
                 continue;
             }
 

src/conn/pool/futures/disconnect_pool.rs

@@ -60,7 +60,8 @@ impl Future for DisconnectPool {
                 Some(drop) => match drop.send(None) {
                     Ok(_) => {
                         // Recycler is alive. Waiting for it to finish.
-                        Poll::Ready(Ok(ready!(Box::pin(drop.closed()).as_mut().poll(cx))))
+                        ready!(Box::pin(drop.closed()).as_mut().poll(cx));
+                        Poll::Ready(Ok(()))
                     }
                     Err(_) => {
                         // Recycler seem dead. No one will wake us.