Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 04:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: use u64 instead of usize to calculate storage usage

Browse Source 
On 32-bit systems such as old Android phones usize is 32-bit as well
and cannot store sizes that exceed 4 GiB.
This commit is contained in:
link2xt
2025-12-06 11:25:32 +00:00
committed by l
parent 646728372b
commit 014d2ace76
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/storage_usage.rs
View File

@@ -8,12 +8,12 @@ use humansize::{BINARY, format_size};
#[derive(Debug)] #[derive(Debug)]
pub struct StorageUsage { pub struct StorageUsage {
/// Total database size, subtract this from the backup size to estimate size of all blobs /// Total database size, subtract this from the backup size to estimate size of all blobs
pub db_size: usize, pub db_size: u64,
/// size and row count of the 10 biggest tables /// size and row count of the 10 biggest tables
pub largest_tables: Vec<(String, usize, Option<usize>)>, pub largest_tables: Vec<(String, u64, Option<u64>)>,
/// count and total size of status updates /// count and total size of status updates
/// for the 10 webxdc apps with the most size usage in status updates /// for the 10 webxdc apps with the most size usage in status updates
pub largest_webxdc_data: Vec<(MsgId, usize, usize)>, pub largest_webxdc_data: Vec<(MsgId, u64, u64)>,
} }
impl std::fmt::Display for StorageUsage { impl std::fmt::Display for StorageUsage {
@@ -46,12 +46,12 @@ impl std::fmt::Display for StorageUsage {
/// Get storage usage information for the Context's database /// Get storage usage information for the Context's database
pub async fn get_storage_usage(ctx: &Context) -> Result<StorageUsage> { pub async fn get_storage_usage(ctx: &Context) -> Result<StorageUsage> {
let page_size: usize = ctx let page_size: u64 = ctx
.sql .sql
.query_get_value("PRAGMA page_size", ()) .query_get_value("PRAGMA page_size", ())
.await? .await?
.unwrap_or_default(); .unwrap_or_default();
let page_count: usize = ctx let page_count: u64 = ctx
.sql .sql
.query_get_value("PRAGMA page_count", ()) .query_get_value("PRAGMA page_count", ())
.await? .await?
@@ -68,7 +68,7 @@ pub async fn get_storage_usage(ctx: &Context) -> Result<StorageUsage> {
(), (),
|row| { |row| {
let name: String = row.get(0)?; let name: String = row.get(0)?;
let size: usize = row.get(1)?; let size: u64 = row.get(1)?;
Ok((name, size, None)) Ok((name, size, None))
}, },
) )
@@ -76,7 +76,7 @@ pub async fn get_storage_usage(ctx: &Context) -> Result<StorageUsage> {
for row in &mut largest_tables { for row in &mut largest_tables {
let name = &row.0; let name = &row.0;
let row_count: Result<Option<usize>> = ctx let row_count: Result<Option<u64>> = ctx
.sql .sql
// SECURITY: the table name comes from the db, not from the user // SECURITY: the table name comes from the db, not from the user
.query_get_value(&format!("SELECT COUNT(*) FROM {name}"), ()) .query_get_value(&format!("SELECT COUNT(*) FROM {name}"), ())
@@ -93,8 +93,8 @@ pub async fn get_storage_usage(ctx: &Context) -> Result<StorageUsage> {
(), (),
|row| { |row| {
let msg_id: MsgId = row.get(0)?; let msg_id: MsgId = row.get(0)?;
let size: usize = row.get(1)?; let size: u64 = row.get(1)?;
let count: usize = row.get(2)?; let count: u64 = row.get(2)?;
Ok((msg_id, size, count)) Ok((msg_id, size, count))
}, },