refactor: fix warnings
This commit is contained in:
parent
ee8e72f7a8
commit
8c90e7adfb
4 changed files with 24 additions and 37 deletions
|
@ -4,7 +4,6 @@ use std::{future::Future, pin::Pin, sync::Arc, sync::RwLock};
|
|||
|
||||
pub struct Engine {
|
||||
rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
|
||||
cache_capacity_bytes: usize,
|
||||
max_open_files: i32,
|
||||
cache: rocksdb::Cache,
|
||||
old_cfs: Vec<String>,
|
||||
|
@ -17,11 +16,7 @@ pub struct RocksDbEngineTree<'a> {
|
|||
write_lock: RwLock<()>,
|
||||
}
|
||||
|
||||
fn db_options(
|
||||
cache_capacity_bytes: usize,
|
||||
max_open_files: i32,
|
||||
rocksdb_cache: &rocksdb::Cache,
|
||||
) -> rocksdb::Options {
|
||||
fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::Options {
|
||||
let mut block_based_options = rocksdb::BlockBasedOptions::default();
|
||||
block_based_options.set_block_cache(rocksdb_cache);
|
||||
|
||||
|
@ -57,11 +52,7 @@ impl DatabaseEngine for Arc<Engine> {
|
|||
let cache_capacity_bytes = (config.db_cache_capacity_mb * 1024.0 * 1024.0) as usize;
|
||||
let rocksdb_cache = rocksdb::Cache::new_lru_cache(cache_capacity_bytes).unwrap();
|
||||
|
||||
let db_opts = db_options(
|
||||
cache_capacity_bytes,
|
||||
config.rocksdb_max_open_files,
|
||||
&rocksdb_cache,
|
||||
);
|
||||
let db_opts = db_options(config.rocksdb_max_open_files, &rocksdb_cache);
|
||||
|
||||
let cfs = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::list_cf(
|
||||
&db_opts,
|
||||
|
@ -75,18 +66,13 @@ impl DatabaseEngine for Arc<Engine> {
|
|||
cfs.iter().map(|name| {
|
||||
rocksdb::ColumnFamilyDescriptor::new(
|
||||
name,
|
||||
db_options(
|
||||
cache_capacity_bytes,
|
||||
config.rocksdb_max_open_files,
|
||||
&rocksdb_cache,
|
||||
),
|
||||
db_options(config.rocksdb_max_open_files, &rocksdb_cache),
|
||||
)
|
||||
}),
|
||||
)?;
|
||||
|
||||
Ok(Arc::new(Engine {
|
||||
rocks: db,
|
||||
cache_capacity_bytes,
|
||||
max_open_files: config.rocksdb_max_open_files,
|
||||
cache: rocksdb_cache,
|
||||
old_cfs: cfs,
|
||||
|
@ -96,10 +82,9 @@ impl DatabaseEngine for Arc<Engine> {
|
|||
fn open_tree(&self, name: &'static str) -> Result<Arc<dyn Tree>> {
|
||||
if !self.old_cfs.contains(&name.to_owned()) {
|
||||
// Create if it didn't exist
|
||||
let _ = self.rocks.create_cf(
|
||||
name,
|
||||
&db_options(self.cache_capacity_bytes, self.max_open_files, &self.cache),
|
||||
);
|
||||
let _ = self
|
||||
.rocks
|
||||
.create_cf(name, &db_options(self.max_open_files, &self.cache));
|
||||
}
|
||||
|
||||
Ok(Arc::new(RocksDbEngineTree {
|
||||
|
|
|
@ -534,7 +534,8 @@ impl Sending {
|
|||
.collect::<Vec<_>>(),
|
||||
),
|
||||
base64::URL_SAFE_NO_PAD,
|
||||
)).into(),
|
||||
))
|
||||
.into(),
|
||||
},
|
||||
)
|
||||
.await
|
||||
|
@ -692,7 +693,8 @@ impl Sending {
|
|||
.collect::<Vec<_>>(),
|
||||
),
|
||||
base64::URL_SAFE_NO_PAD,
|
||||
)).into(),
|
||||
))
|
||||
.into(),
|
||||
},
|
||||
)
|
||||
.await
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use crate::Result;
|
||||
use ruma::{DeviceId, UserId, identifiers::TransactionId};
|
||||
use ruma::{identifiers::TransactionId, DeviceId, UserId};
|
||||
|
||||
use super::abstraction::Tree;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue