From 18650493a0ee7c203255df725b64a9e8e4599e54 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Mon, 13 May 2024 23:17:22 -0400 Subject: [PATCH 01/13] Allow newer version of rusqlite to match --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ccf9541..a49dc1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ structopt = {version = "0.3.23", optional = true} [dependencies.rusqlite] features = ["functions", "blob", "bundled", "array"] package = "rusqlite-le" -version = "0.24.2" +version >= "0.24.2" [dev-dependencies] chrono = "0.4.19" From f9d957ed785da402b36fdc44dcf947047aeba3b1 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Mon, 13 May 2024 23:22:59 -0400 Subject: [PATCH 02/13] Trying a different way of making the version flexible --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a49dc1a..58f3095 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ structopt = {version = "0.3.23", optional = true} [dependencies.rusqlite] features = ["functions", "blob", "bundled", "array"] package = "rusqlite-le" -version >= "0.24.2" +version = "~0" [dev-dependencies] chrono = "0.4.19" From 3dfdfa74fee7e4df3ee5e3bde5fccaff6ae18c3c Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Mon, 13 May 2024 23:26:06 -0400 Subject: [PATCH 03/13] More experiments --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 58f3095..82f4d25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ structopt = {version = "0.3.23", optional = true} [dependencies.rusqlite] features = ["functions", "blob", "bundled", "array"] package = "rusqlite-le" -version = "~0" +version = "0.31.0" [dev-dependencies] chrono = "0.4.19" From 003311ccd40eaa8da59bff0b0a3b9b888a2f4c19 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Mon, 13 May 2024 23:26:52 -0400 Subject: [PATCH 04/13] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 82f4d25..74458e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ structopt = {version = "0.3.23", optional = true} [dependencies.rusqlite] features = ["functions", "blob", "bundled", "array"] -package = "rusqlite-le" +package = "rusqlite" version = "0.31.0" [dev-dependencies] From 79bd4ab0e6431b0c5623d55b2a6f6d55a65e20ea Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 20:51:43 -0400 Subject: [PATCH 05/13] Reverted Cargo.toml --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 74458e1..ccf9541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,8 +51,8 @@ structopt = {version = "0.3.23", optional = true} [dependencies.rusqlite] features = ["functions", "blob", "bundled", "array"] -package = "rusqlite" -version = "0.31.0" +package = "rusqlite-le" +version = "0.24.2" [dev-dependencies] chrono = "0.4.19" From 4cf62ebc11eb5311affc3324c1704de8443996c2 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 20:52:23 -0400 Subject: [PATCH 06/13] Making Rusqlite extern --- src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 7655e36..7559280 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,7 @@ #![warn(clippy::print_stdout)] +pub extern crate rusqlite; + use rusqlite::Connection; use util::init_logging; From f746e5da490721473402dde36b33edac96b8152a Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 20:53:22 -0400 Subject: [PATCH 07/13] Allowing use as a lib --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ccf9541..9a544ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ name = "create_test_db" required-features = ["benchmark"] [lib] -crate-type = ["cdylib"] +crate-type = ["lib", "cdylib"] [dependencies] zstd = {version = "0.11.2", features = ["experimental"]} From 61a0615b56c4864cb2412f91d60161a8ccfd451e Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 20:57:05 -0400 Subject: [PATCH 08/13] Removing experimental tag for zlib --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9a544ea..8cacfce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,9 @@ required-features = ["benchmark"] [lib] crate-type = ["lib", "cdylib"] +#, features = ["experimental"] [dependencies] -zstd = {version = "0.11.2", features = ["experimental"]} +zstd = {version = "0.11.2"} #zstd = {version = "0.5.3", path="../zstd-rs"} #zstd = {version = "=0.5.4"} anyhow = "1.0.44" From 81c7d95553b17e8f15b5a97765c308e71e05a110 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 20:59:20 -0400 Subject: [PATCH 09/13] Updating ZLIB --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8cacfce..81d726d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,9 +31,9 @@ required-features = ["benchmark"] [lib] crate-type = ["lib", "cdylib"] -#, features = ["experimental"] +#version = "0.11.2", features = ["experimental"] [dependencies] -zstd = {version = "0.11.2"} +zstd = {version = "0.13.1"} #zstd = {version = "0.5.3", path="../zstd-rs"} #zstd = {version = "=0.5.4"} anyhow = "1.0.44" From cc6fa72977f6656f91708062b78125012e912c4c Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 21:03:09 -0400 Subject: [PATCH 10/13] Readding experimentals --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 81d726d..a5523c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ crate-type = ["lib", "cdylib"] #version = "0.11.2", features = ["experimental"] [dependencies] -zstd = {version = "0.13.1"} +zstd = {version = "0.13.1", features = ["experimental"]} #zstd = {version = "0.5.3", path="../zstd-rs"} #zstd = {version = "=0.5.4"} anyhow = "1.0.44" From 4c417195be14b24ed06e98fb5666f9d1c964e5ba Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 21:07:57 -0400 Subject: [PATCH 11/13] Changing to Option to match new API --- src/basic.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic.rs b/src/basic.rs index 22a5844..488e309 100644 --- a/src/basic.rs +++ b/src/basic.rs @@ -89,7 +89,7 @@ fn zstd_compress_fn_tail<'a>( { // pledge source size (benchmarking shows this doesn't help any tho) let cctx = encoder.context_mut(); - cctx.set_pledged_src_size(input_value.len() as u64) + cctx.set_pledged_src_size(Some(input_value.len() as u64)) .map_err(|c| anyhow::anyhow!("setting pledged source size (code {c})"))?; // cctx.set_parameter(zstd::zstd_safe::CParameter::BlockDelimiters(false)) // .map_err(|_| anyhow::anyhow!("no"))?; From 6c8fe83e465c21d235c099d5ecfabbe73e111b5e Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 21:15:00 -0400 Subject: [PATCH 12/13] Removed excess comment --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a5523c4..4ed1fc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,6 @@ required-features = ["benchmark"] [lib] crate-type = ["lib", "cdylib"] -#version = "0.11.2", features = ["experimental"] [dependencies] zstd = {version = "0.13.1", features = ["experimental"]} #zstd = {version = "0.5.3", path="../zstd-rs"} From ac555676eb827ee71dab3b6a8c30a58eda54f593 Mon Sep 17 00:00:00 2001 From: jsonbourne <23709372+kodeschreiber@users.noreply.github.com> Date: Thu, 16 May 2024 22:16:06 -0400 Subject: [PATCH 13/13] Patching rusqlite --- Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 4ed1fc5..8e03ae2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,6 +54,11 @@ features = ["functions", "blob", "bundled", "array"] package = "rusqlite-le" version = "0.24.2" +[patch.crates-io.rusqlite] +features = ["functions", "blob", "bundled", "array"] +git = "https://github.com/rusqlite/rusqlite.git" +tag = "v0.31.0" + [dev-dependencies] chrono = "0.4.19" names = "0.14.0"