gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

address review feedback - use u64 instead of usize

Browse Source
This commit is contained in:
Anton Lazarev
2021-12-01 23:26:03 -08:00
committed by Michael Vines
parent adbf31b98c
commit 6bb884836c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/append_vec.rs
View File

@ -15,6 +15,7 @@ use solana_sdk::{
}; };
use std::{ use std::{
borrow::Borrow, borrow::Borrow,
convert::TryFrom,
fs::{remove_file, OpenOptions}, fs::{remove_file, OpenOptions},
io, io,
io::{Seek, SeekFrom, Write}, io::{Seek, SeekFrom, Write},
@ -33,10 +34,7 @@ macro_rules! u64_align {
}; };
} }
#[cfg(target_pointer_width = "64")] const MAXIMUM_APPEND_VEC_FILE_SIZE: u64 = 16 * 1024 * 1024 * 1024; // 16 GiB
const MAXIMUM_APPEND_VEC_FILE_SIZE: usize = 16 * 1024 * 1024 * 1024; // 16 GiB
#[cfg(target_pointer_width = "32")]
const MAXIMUM_APPEND_VEC_FILE_SIZE: usize = 2 * 1024 * 1024 * 1024; // 2 GiB
pub type StoredMetaWriteVersion = u64; pub type StoredMetaWriteVersion = u64;
@ -259,7 +257,10 @@ impl AppendVec {
std::io::ErrorKind::Other, std::io::ErrorKind::Other,
format!("too small file size {} for AppendVec", file_size), format!("too small file size {} for AppendVec", file_size),
)) ))
} else if file_size > MAXIMUM_APPEND_VEC_FILE_SIZE { } else if usize::try_from(MAXIMUM_APPEND_VEC_FILE_SIZE)
.map(|max| file_size > max)
.unwrap_or(true)
{
Err(std::io::Error::new( Err(std::io::Error::new(
std::io::ErrorKind::Other, std::io::ErrorKind::Other,
format!("too large file size {} for AppendVec", file_size), format!("too large file size {} for AppendVec", file_size),