Merge pull request #89 from theseus-rs/remove-bytes-dependency

refactor!: remove bytes dependency

Author: brianheineman

Cargo.lock

@@ -25,7 +25,6 @@ version = "0.12.0"
 anyhow = "1.0.86"
 async-trait = "0.1.80"
 blake2 = "0.10.6"
-bytes = "1.6.0"
 criterion = "0.5.1"
 flate2 = "1.0.30"
 hex = "0.4.3"

Cargo.toml

@@ -13,7 +13,6 @@ version.workspace = true
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 blake2 = { workspace = true }
-bytes = { workspace = true }
 flate2 = { workspace = true }
 hex = { workspace = true }
 http = { workspace = true }

postgresql_archive/Cargo.toml

@@ -1,4 +1,3 @@
-use bytes::Bytes;
 use criterion::{criterion_group, criterion_main, Criterion};
 use postgresql_archive::blocking::{extract, get_archive};
 use postgresql_archive::{Result, VersionReq, DEFAULT_POSTGRESQL_URL};
@@ -22,7 +21,7 @@ fn bench_extract(criterion: &mut Criterion) -> Result<()> {
     Ok(())
 }
 
-fn extract_archive(archive: &Bytes) -> Result<()> {
+fn extract_archive(archive: &Vec<u8>) -> Result<()> {
     let out_dir = tempfile::tempdir()?.path().to_path_buf();
     create_dir_all(&out_dir)?;
     extract(archive, &out_dir)?;

postgresql_archive/benches/archive.rs

@@ -4,7 +4,6 @@
 use crate::error::Error::Unexpected;
 use crate::error::Result;
 use crate::repository;
-use bytes::Bytes;
 use flate2::bufread::GzDecoder;
 use human_bytes::human_bytes;
 use num_format::{Locale, ToFormattedString};
@@ -39,12 +38,11 @@ pub async fn get_version(url: &str, version_req: &VersionReq) -> Result<Version>
 /// * If the archive is not found.
 /// * If the archive cannot be downloaded.
 #[instrument]
-pub async fn get_archive(url: &str, version_req: &VersionReq) -> Result<(Version, Bytes)> {
+pub async fn get_archive(url: &str, version_req: &VersionReq) -> Result<(Version, Vec<u8>)> {
     let repository = repository::registry::get(url)?;
     let archive = repository.get_archive(version_req).await?;
     let version = archive.version().clone();
-    let archive_bytes = archive.bytes().to_vec();
-    let bytes = Bytes::from(archive_bytes.clone());
+    let bytes = archive.bytes().to_vec();
     Ok((version, bytes))
 }
 
@@ -97,13 +95,13 @@ fn acquire_lock(out_dir: &Path) -> Result<PathBuf> {
     Err(Unexpected("Failed to acquire lock".to_string()))
 }
 
-/// Extracts the compressed tar [bytes](Bytes) to the [out_dir](Path).
+/// Extracts the compressed tar `bytes` to the [out_dir](Path).
 ///
 /// # Errors
 /// Returns an error if the extraction fails.
 #[allow(clippy::cast_precision_loss)]
 #[instrument(skip(bytes))]
-pub async fn extract(bytes: &Bytes, out_dir: &Path) -> Result<()> {
+pub async fn extract(bytes: &Vec<u8>, out_dir: &Path) -> Result<()> {
     let input = BufReader::new(Cursor::new(bytes));
     let decoder = GzDecoder::new(input);
     let mut archive = Archive::new(decoder);

postgresql_archive/src/archive.rs

@@ -1,5 +1,4 @@
 use crate::{Version, VersionReq};
-use bytes::Bytes;
 use std::path::Path;
 use tokio::runtime::Runtime;
 
@@ -25,17 +24,17 @@ pub fn get_version(url: &str, version_req: &VersionReq) -> crate::Result<Version
 /// # Errors
 /// * If the archive is not found.
 /// * If the archive cannot be downloaded.
-pub fn get_archive(url: &str, version_req: &VersionReq) -> crate::Result<(Version, Bytes)> {
+pub fn get_archive(url: &str, version_req: &VersionReq) -> crate::Result<(Version, Vec<u8>)> {
     RUNTIME
         .handle()
         .block_on(async move { crate::get_archive(url, version_req).await })
 }
 
-/// Extracts the compressed tar [bytes](Bytes) to the [out_dir](Path).
+/// Extracts the compressed tar `bytes` to the [out_dir](Path).
 ///
 /// # Errors
 /// Returns an error if the extraction fails.
-pub fn extract(bytes: &Bytes, out_dir: &Path) -> crate::Result<()> {
+pub fn extract(bytes: &Vec<u8>, out_dir: &Path) -> crate::Result<()> {
     RUNTIME
         .handle()
         .block_on(async move { crate::extract(bytes, out_dir).await })

postgresql_archive/src/blocking/archive.rs

@@ -81,6 +81,14 @@ pub fn get<S: AsRef<str>>(extension: S) -> Option<HasherFn> {
 mod tests {
     use super::*;
 
+    fn test_hasher(extension: &str, expected: &str) -> Result<()> {
+        let hasher = get(extension).unwrap();
+        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+        let hash = hasher(&data)?;
+        assert_eq!(expected, hash);
+        Ok(())
+    }
+
     #[test]
     fn test_register() -> Result<()> {
         let extension = "sha256";
@@ -91,92 +99,57 @@ mod tests {
         register(extension, sha2_256::hash);
         assert_eq!(hashers, REGISTRY.lock().unwrap().hashers.len());
 
-        let hasher = get(extension).unwrap();
-        let data = vec![1, 2, 3];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
-            "039058c6f2c0cb492c533b0a4d14ef77cc0f78abccced5287d84a1a2011cfb81",
-            hash
-        );
-        Ok(())
+        test_hasher(
+            extension,
+            "9a89c68c4c5e28b8c4a5567673d462fff515db46116f9900624d09c474f593fb",
+        )
     }
 
     #[test]
     fn test_sha2_256() -> Result<()> {
-        let hasher = get("sha256").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
+        test_hasher(
+            "sha256",
             "9a89c68c4c5e28b8c4a5567673d462fff515db46116f9900624d09c474f593fb",
-            hash
-        );
-        Ok(())
+        )
     }
 
     #[test]
     fn test_sha2_512() -> Result<()> {
-        let hasher = get("sha512").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
+        test_hasher(
+            "sha512",
             "3ad3f36979450d4f53366244ecf1010f4f9121d6888285ff14104fd5aded85d48aa171bf1e33a112602f92b7a7088b298789012fb87b9056321241a19fb74e0b",
-            hash
-        );
-        Ok(())
+        )
     }
 
     #[test]
     fn test_sha3_256() -> Result<()> {
-        let hasher = get("sha3-256").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
+        test_hasher(
+            "sha3-256",
             "c0188232190e0427fc9cc78597221c76c799528660889bd6ce1f3563148ff84d",
-            hash
-        );
-        Ok(())
+        )
     }
 
     #[test]
     fn test_sha3_512() -> Result<()> {
-        let hasher = get("sha3-512").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
+        test_hasher(
+            "sha3-512",
             "9429fc1f9772cc1d8039fe75cc1b033cd60f0ec4face0f8a514d25b0649ba8a5954b6c7a41cc3697a56db3ff321475be1fa14b70c7eb78fec6ce62dbfc54c9d3",
-            hash
-        );
-        Ok(())
+        )
     }
 
     #[test]
     fn test_blake2s_256() -> Result<()> {
-        let hasher = get("blake2s").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
+        test_hasher(
+            "blake2s",
             "7125921e06071710350390fe902856dbea366a5d6f5ee26c18e741143ac80061",
-            hash
-        );
-        Ok(())
+        )
     }
 
     #[test]
-    fn test_blake2s_512() -> Result<()> {
-        let hasher = get("blake2s").unwrap();
-        let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        let hash = hasher(&data)?;
-
-        assert_eq!(
-            "7125921e06071710350390fe902856dbea366a5d6f5ee26c18e741143ac80061",
-            hash
-        );
-        Ok(())
+    fn test_blake2b_512() -> Result<()> {
+        test_hasher(
+            "blake2b",
+            "67767f1cab415502dcceec9f099fb84539b1c73c5ebdcfe1bb8ca7411e3b6cb33e304f49222edac9bdaa74129e9e13f11f215b8560f9081f0e8f1f869162bf46",
+        )
     }
 }

postgresql_archive/src/hasher/registry.rs

@@ -7,7 +7,6 @@ use crate::Error::{
 };
 use crate::{hasher, matcher, Result};
 use async_trait::async_trait;
-use bytes::Bytes;
 use http::{header, Extensions};
 use human_bytes::human_bytes;
 use regex::Regex;
@@ -237,7 +236,7 @@ impl Repository for GitHub {
         debug!("Downloading archive {}", asset.browser_download_url);
         let request = client.get(&asset.browser_download_url);
         let response = request.send().await?.error_for_status()?;
-        let archive: Bytes = response.bytes().await?;
+        let archive = response.bytes().await?;
         let bytes = archive.to_vec();
         debug!(
             "Archive {} downloaded: {}",

postgresql_archive/src/repository/github/repository.rs

@@ -18,7 +18,6 @@ tokio = { workspace = true, features = ["full"] }
 
 [dependencies]
 anyhow = { workspace = true }
-bytes = { workspace = true }
 home = { workspace = true }
 lazy_static = { workspace = true }
 postgresql_archive = { path = "../postgresql_archive", version = "0.12.0", default-features = false }

postgresql_embedded/Cargo.toml

@@ -157,7 +157,7 @@ impl PostgreSQL {
             debug!("Using bundled installation archive");
             (
                 self.settings.version.clone(),
-                bytes::Bytes::copy_from_slice(crate::settings::ARCHIVE),
+                crate::settings::ARCHIVE.to_vec(),
             )
         } else {
             let (version, bytes) =