From acc0bdad1a9e3a13f735145a75f7939e5a501644 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sat, 13 Jan 2024 15:18:12 -0500
Subject: [PATCH] update rocksdb to 8.10.0
https://github.com/rust-rocksdb/rust-rocksdb/pull/852
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
Cargo.lock | 6 +++---
Cargo.toml | 6 +++---
DIFFERENCES.md | 2 +-
flake.lock | 12 ++++++------
flake.nix | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index a659a2057..28a5ab94e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1275,8 +1275,8 @@ dependencies = [
[[package]]
name = "librocksdb-sys"
-version = "0.15.0+8.9.1"
-source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=66f04df013b6e6bd42b5a8c353406e09a7c7da2a#66f04df013b6e6bd42b5a8c353406e09a7c7da2a"
+version = "0.16.0+8.10.0"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=8fccdf5473e3e75a5ce0f42e5ff5e89c2012305b#8fccdf5473e3e75a5ce0f42e5ff5e89c2012305b"
dependencies = [
"bindgen",
"bzip2-sys",
@@ -2010,7 +2010,7 @@ dependencies = [
[[package]]
name = "rocksdb"
version = "0.21.0"
-source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=66f04df013b6e6bd42b5a8c353406e09a7c7da2a#66f04df013b6e6bd42b5a8c353406e09a7c7da2a"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=8fccdf5473e3e75a5ce0f42e5ff5e89c2012305b#8fccdf5473e3e75a5ce0f42e5ff5e89c2012305b"
dependencies = [
"libc",
"librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 3aaf3abc8..c3cb7c561 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,7 +85,7 @@ threadpool = "1.8.1"
# Used for ruma wrapper
serde_html_form = "0.2.3"
-rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "66f04df013b6e6bd42b5a8c353406e09a7c7da2a", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd"], optional = true }
+rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "8fccdf5473e3e75a5ce0f42e5ff5e89c2012305b", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd"], optional = true }
thread_local = "1.1.7"
# used for TURN server authentication
@@ -200,8 +200,8 @@ unused_qualifications = "warn"
# unused_tuple_struct_fields = "warn"
[workspace.lints.clippy]
-suspicious = "deny"
-perf = "deny"
+suspicious = "warn" # assume deny in practice
+perf = "warn" # assume deny in practice
# redundant_clone = "warn"
# cloned_instead_of_copied = "warn"
expl_impl_clone_on_copy = "warn"
diff --git a/DIFFERENCES.md b/DIFFERENCES.md
index 6497c3d1f..5997c9609 100644
--- a/DIFFERENCES.md
+++ b/DIFFERENCES.md
@@ -40,7 +40,7 @@ ### list of features, bug fixes, etc that conduwuit does that upstream does not:
- Add non-standard sliding sync proxy health check (?) endpoint at `/client/server.json` that some clients such as Element Web query using the `well_known_client` or `well_known_server` config options
- Send a User-Agent on all of our requests (`conduwuit/0.7.0-alpha+conduwuit-0.1.1`) which strangely was not done upstream since forever. Some providers consider no User-Agent suspicious and block said requests.
- Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic
-- Basic binary commands like `conduwuit ---version` work (interested in expanding it more)
+- Basic binary commands like `conduwuit --version` work (interested in expanding it more)
- Keep track of remote user profiles for profile directory (user profile searching) and local requests for remote profiles (via upstream MR with changes)
- Allow HEAD HTTP requests in CORS for clients (despite not being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need to behave the same as GET requests, Synapse supports HEAD requests)
- Bump MSRV to 1.74.1
diff --git a/flake.lock b/flake.lock
index 0aa36a96a..c33dea457 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1704954214,
- "narHash": "sha256-1irsqIeIfSnNJnbmev9YE0tVG4l0aSG4HjTJqWb5LxE=",
+ "lastModified": 1705126891,
+ "narHash": "sha256-RnCWzRghSpyxKs3kXgYPkZv6TvzV3Pmve1je6RQHe1o=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "4c6dd8a90b53dc9606d35c59b68168c3768fde2c",
+ "rev": "89a02ff13d98d54f0b3b41f9b8326eb26d7cdc2e",
"type": "github"
},
"original": {
@@ -86,11 +86,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1704895810,
- "narHash": "sha256-kPFrPV6wgGF2beB+nkDI+nb4l9uC9oS4b4V6iUz/ZDw=",
+ "lastModified": 1704974004,
+ "narHash": "sha256-H3RdtMxH8moTInVmracgtF8bgFpaEE3zYoSkuv7PBs0=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "e4344f5fce3b4ca12d51bf27b9a0bd29297be3ea",
+ "rev": "9d8889cdfcc3aa0302353fc988ed21ff9bc9925c",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 5b90b1a0a..89eb69644 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
(final: prev: {
rocksdb = prev.rocksdb.overrideAttrs (old:
let
- version = "8.9.1";
+ version = "8.10.0";
in
{
inherit version;
@@ -38,7 +38,7 @@
owner = "facebook";
repo = "rocksdb";
rev = "v${version}";
- hash = "sha256-Pl7t4FVOvnORWFS+gjy2EEUQlPxjLukWW5I5gzCQwkI=";
+ hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
};
});
})
--
GitLab