magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove dbg's, update rocksdb, use iouring

Browse source 
Signed-off-by: girlbossceo <june@girlboss.ceo>
This commit is contained in:
girlbossceo 2023-09-24 10:17:26 -04:00
parent 0390d19b56
commit f72fd67a71
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -1372,9 +1372,8 @@ dependencies = [
[[package]] [[package]]
name = "librocksdb-sys" name = "librocksdb-sys"
version = "0.11.0+8.1.1" version = "0.12.0+8.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=734cf99e732c84702a4e73be5dd4aea99bc268f5#734cf99e732c84702a4e73be5dd4aea99bc268f5"
checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"bzip2-sys", "bzip2-sys",
@ -1383,6 +1382,7 @@ dependencies = [
"libc", "libc",
"libz-sys", "libz-sys",
"lz4-sys", "lz4-sys",
"pkg-config",
"zstd-sys", "zstd-sys",
] ]
@ -2144,8 +2144,7 @@ dependencies = [
[[package]] [[package]]
name = "rocksdb" name = "rocksdb"
version = "0.21.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=734cf99e732c84702a4e73be5dd4aea99bc268f5#734cf99e732c84702a4e73be5dd4aea99bc268f5"
checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
dependencies = [ dependencies = [
"libc", "libc",
"librocksdb-sys", "librocksdb-sys",

6
Cargo.toml
View file

@ -47,11 +47,11 @@ http = "0.2.9"
# Used to find data directory for default db path # Used to find data directory for default db path
directories = "5.0.1" directories = "5.0.1"
# Used for ruma wrapper # Used for ruma wrapper
serde_json = { version = "1.0.96", features = ["raw_value"] } serde_json = { version = "1.0.107", features = ["raw_value"] }
# Used for appservice registration files # Used for appservice registration files
serde_yaml = "0.9.21" serde_yaml = "0.9.21"
# Used for pdu definition # Used for pdu definition
serde = { version = "1.0.163", features = ["rc"] } serde = { version = "1.0.188", features = ["rc"] }
# Used for secure identifiers # Used for secure identifiers
rand = "0.8.5" rand = "0.8.5"
# Used to hash passwords # Used to hash passwords
@ -88,7 +88,7 @@ heed = { git = "https://github.com/timokoesters/heed.git", rev = "f6f825da7fb2c7
# Used for ruma wrapper # Used for ruma wrapper
serde_html_form = "0.2.0" serde_html_form = "0.2.0"
rocksdb = { version = "0.21.0", default-features = true, features = ["multi-threaded-cf", "zstd"], optional = true } rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "734cf99e732c84702a4e73be5dd4aea99bc268f5", default-features = true, features = ["multi-threaded-cf", "zstd", "io-uring"], optional = true }
thread_local = "1.1.7" thread_local = "1.1.7"
# used for TURN server authentication # used for TURN server authentication

5
src/api/client_server/sync.rs
View file

@ -1172,7 +1172,6 @@ fn share_encrypted_room(
pub async fn sync_events_v4_route( pub async fn sync_events_v4_route(
body: Ruma<sync_events::v4::Request>, body: Ruma<sync_events::v4::Request>,
) -> Result<sync_events::v4::Response, RumaResponse<UiaaResponse>> { ) -> Result<sync_events::v4::Response, RumaResponse<UiaaResponse>> {
dbg!(&body.body);
let sender_user = body.sender_user.expect("user is authenticated"); let sender_user = body.sender_user.expect("user is authenticated");
let sender_device = body.sender_device.expect("user is authenticated"); let sender_device = body.sender_device.expect("user is authenticated");
let mut body = body.body; let mut body = body.body;
@ -1689,7 +1688,7 @@ pub async fn sync_events_v4_route(
let _ = tokio::time::timeout(duration, watcher).await; let _ = tokio::time::timeout(duration, watcher).await;
} }
Ok(dbg!(sync_events::v4::Response { Ok(sync_events::v4::Response {
initial: globalsince == 0, initial: globalsince == 0,
txn_id: body.txn_id.clone(), txn_id: body.txn_id.clone(),
pos: next_batch.to_string(), pos: next_batch.to_string(),
@ -1744,5 +1743,5 @@ pub async fn sync_events_v4_route(
}, },
}, },
delta_token: None, delta_token: None,
})) })
} }