Unverified Commit c86a07db authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: Streaming write of SST files (#82048)

### What?

Write SST while processing blocks to avoid keeping all blocks in memory. Reduces temporary memory used by persisting.
parent 4f410927
...@@ -31,8 +31,8 @@ fn main() -> Result<()> { ...@@ -31,8 +31,8 @@ fn main() -> Result<()> {
sequence_number, sequence_number,
min_hash, min_hash,
max_hash, max_hash,
aqmf_size, amqf_size,
aqmf_entries, amqf_entries,
sst_size, sst_size,
key_compression_dictionary_size, key_compression_dictionary_size,
value_compression_dictionary_size, value_compression_dictionary_size,
...@@ -43,7 +43,7 @@ fn main() -> Result<()> { ...@@ -43,7 +43,7 @@ fn main() -> Result<()> {
" SST {sequence_number:08}.sst: {min_hash:016x} - {max_hash:016x} (p = 1/{})", " SST {sequence_number:08}.sst: {min_hash:016x} - {max_hash:016x} (p = 1/{})",
u64::MAX / (max_hash - min_hash + 1) u64::MAX / (max_hash - min_hash + 1)
); );
println!(" AQMF {aqmf_entries} entries = {} KiB", aqmf_size / 1024); println!(" AMQF {amqf_entries} entries = {} KiB", amqf_size / 1024);
println!( println!(
" {} KiB = {} kiB key compression dict + {} KiB value compression dict + \ " {} KiB = {} kiB key compression dict + {} KiB value compression dict + \
{block_count} blocks (avg {} bytes/block)", {block_count} blocks (avg {} bytes/block)",
......
...@@ -21,7 +21,7 @@ There are four different file types: ...@@ -21,7 +21,7 @@ There are four different file types:
- Static Sorted Table (SST, `*.sst`): These files contain key value pairs. - Static Sorted Table (SST, `*.sst`): These files contain key value pairs.
- Blob files (`*.blob`): These files contain large values. - Blob files (`*.blob`): These files contain large values.
- Delete files (`*.del`): These files contain a list of sequence numbers of files that should be considered as deleted. - Delete files (`*.del`): These files contain a list of sequence numbers of files that should be considered as deleted.
- Meta files (`*.meta`): These files contain metadata about the SST files. They contains the hash range and a AQMF for quick filtering. - Meta files (`*.meta`): These files contain metadata about the SST files. They contains the hash range and a AMQF for quick filtering.
Therefore there are there value types: Therefore there are there value types:
...@@ -50,9 +50,9 @@ A meta file can contain metadata about multiple SST files. The metadata is store ...@@ -50,9 +50,9 @@ A meta file can contain metadata about multiple SST files. The metadata is store
- 8 bytes min hash - 8 bytes min hash
- 8 bytes max hash - 8 bytes max hash
- 8 bytes SST file size - 8 bytes SST file size
- 4 bytes end of AQMF offset relative to start of all AQMF data - 4 bytes end of AMQF offset relative to start of all AMQF data
- foreach described SST file - foreach described SST file
- serialized AQMF - serialized AMQF
### SST file ### SST file
...@@ -139,7 +139,7 @@ Reading start from the current sequence number and goes downwards. ...@@ -139,7 +139,7 @@ Reading start from the current sequence number and goes downwards.
- We have all SST files memory mapped - We have all SST files memory mapped
- for i = CURRENT sequence number .. 0 - for i = CURRENT sequence number .. 0
- Check AQMF from SST file for key existance -> if not continue - Check AMQF from SST file for key existance -> if not continue
- let block = 0 - let block = 0
- loop - loop
- Index Block: find key range that contains the key by binary search - Index Block: find key range that contains the key by binary search
......
...@@ -21,9 +21,9 @@ pub const DATA_THRESHOLD_PER_COMPACTED_FILE: usize = 256 * 1024 * 1024; ...@@ -21,9 +21,9 @@ pub const DATA_THRESHOLD_PER_COMPACTED_FILE: usize = 256 * 1024 * 1024;
/// MAX_ENTRIES_PER_INITIAL_FILE and DATA_THRESHOLD_PER_INITIAL_FILE. /// MAX_ENTRIES_PER_INITIAL_FILE and DATA_THRESHOLD_PER_INITIAL_FILE.
pub const THREAD_LOCAL_SIZE_SHIFT: usize = 7; pub const THREAD_LOCAL_SIZE_SHIFT: usize = 7;
/// Maximum RAM bytes for AQMF cache /// Maximum RAM bytes for AMQF cache
pub const AQMF_CACHE_SIZE: u64 = 300 * 1024 * 1024; pub const AMQF_CACHE_SIZE: u64 = 300 * 1024 * 1024;
pub const AQMF_AVG_SIZE: usize = 37399; pub const AMQF_AVG_SIZE: usize = 37399;
/// Maximum RAM bytes for key block cache /// Maximum RAM bytes for key block cache
pub const KEY_BLOCK_CACHE_SIZE: u64 = 400 * 1024 * 1024; pub const KEY_BLOCK_CACHE_SIZE: u64 = 400 * 1024 * 1024;
......
...@@ -27,18 +27,18 @@ use crate::{ ...@@ -27,18 +27,18 @@ use crate::{
arc_slice::ArcSlice, arc_slice::ArcSlice,
compaction::selector::{Compactable, compute_metrics, get_merge_segments}, compaction::selector::{Compactable, compute_metrics, get_merge_segments},
constants::{ constants::{
AQMF_AVG_SIZE, AQMF_CACHE_SIZE, DATA_THRESHOLD_PER_COMPACTED_FILE, KEY_BLOCK_AVG_SIZE, AMQF_AVG_SIZE, AMQF_CACHE_SIZE, DATA_THRESHOLD_PER_COMPACTED_FILE, KEY_BLOCK_AVG_SIZE,
KEY_BLOCK_CACHE_SIZE, MAX_ENTRIES_PER_COMPACTED_FILE, VALUE_BLOCK_AVG_SIZE, KEY_BLOCK_CACHE_SIZE, MAX_ENTRIES_PER_COMPACTED_FILE, VALUE_BLOCK_AVG_SIZE,
VALUE_BLOCK_CACHE_SIZE, VALUE_BLOCK_CACHE_SIZE,
}, },
key::{StoreKey, hash_key}, key::{StoreKey, hash_key},
lookup_entry::{LookupEntry, LookupValue}, lookup_entry::{LookupEntry, LookupValue},
merge_iter::MergeIter, merge_iter::MergeIter,
meta_file::{AqmfCache, MetaFile, MetaLookupResult, StaticSortedFileRange}, meta_file::{AmqfCache, MetaFile, MetaLookupResult, StaticSortedFileRange},
meta_file_builder::MetaFileBuilder, meta_file_builder::MetaFileBuilder,
sst_filter::SstFilter, sst_filter::SstFilter,
static_sorted_file::{BlockCache, SstLookupResult}, static_sorted_file::{BlockCache, SstLookupResult},
static_sorted_file_builder::{StaticSortedFileBuilder, StaticSortedFileBuilderMeta}, static_sorted_file_builder::{StaticSortedFileBuilderMeta, write_static_stored_file},
write_batch::{FinishResult, WriteBatch}, write_batch::{FinishResult, WriteBatch},
}; };
...@@ -84,12 +84,12 @@ pub struct Statistics { ...@@ -84,12 +84,12 @@ pub struct Statistics {
pub sst_files: usize, pub sst_files: usize,
pub key_block_cache: CacheStatistics, pub key_block_cache: CacheStatistics,
pub value_block_cache: CacheStatistics, pub value_block_cache: CacheStatistics,
pub aqmf_cache: CacheStatistics, pub amqf_cache: CacheStatistics,
pub hits: u64, pub hits: u64,
pub misses: u64, pub misses: u64,
pub miss_family: u64, pub miss_family: u64,
pub miss_range: u64, pub miss_range: u64,
pub miss_aqmf: u64, pub miss_amqf: u64,
pub miss_key: u64, pub miss_key: u64,
} }
...@@ -101,7 +101,7 @@ struct TrackedStats { ...@@ -101,7 +101,7 @@ struct TrackedStats {
hits_blob: std::sync::atomic::AtomicU64, hits_blob: std::sync::atomic::AtomicU64,
miss_family: std::sync::atomic::AtomicU64, miss_family: std::sync::atomic::AtomicU64,
miss_range: std::sync::atomic::AtomicU64, miss_range: std::sync::atomic::AtomicU64,
miss_aqmf: std::sync::atomic::AtomicU64, miss_amqf: std::sync::atomic::AtomicU64,
miss_key: std::sync::atomic::AtomicU64, miss_key: std::sync::atomic::AtomicU64,
miss_global: std::sync::atomic::AtomicU64, miss_global: std::sync::atomic::AtomicU64,
} }
...@@ -119,8 +119,8 @@ pub struct TurboPersistence { ...@@ -119,8 +119,8 @@ pub struct TurboPersistence {
/// A flag to indicate if a write operation is currently active. Prevents multiple concurrent /// A flag to indicate if a write operation is currently active. Prevents multiple concurrent
/// write operations. /// write operations.
active_write_operation: AtomicBool, active_write_operation: AtomicBool,
/// A cache for deserialized AQMF filters. /// A cache for deserialized AMQF filters.
aqmf_cache: AqmfCache, amqf_cache: AmqfCache,
/// A cache for decompressed key blocks. /// A cache for decompressed key blocks.
key_block_cache: BlockCache, key_block_cache: BlockCache,
/// A cache for decompressed value blocks. /// A cache for decompressed value blocks.
...@@ -158,9 +158,9 @@ impl TurboPersistence { ...@@ -158,9 +158,9 @@ impl TurboPersistence {
current_sequence_number: 0, current_sequence_number: 0,
}), }),
active_write_operation: AtomicBool::new(false), active_write_operation: AtomicBool::new(false),
aqmf_cache: AqmfCache::with( amqf_cache: AmqfCache::with(
AQMF_CACHE_SIZE as usize / AQMF_AVG_SIZE, AMQF_CACHE_SIZE as usize / AMQF_AVG_SIZE,
AQMF_CACHE_SIZE, AMQF_CACHE_SIZE,
Default::default(), Default::default(),
Default::default(), Default::default(),
Default::default(), Default::default(),
...@@ -876,11 +876,11 @@ impl TurboPersistence { ...@@ -876,11 +876,11 @@ impl TurboPersistence {
let index_in_meta = ssts_with_ranges[index].index_in_meta; let index_in_meta = ssts_with_ranges[index].index_in_meta;
let meta_file = &meta_files[meta_index]; let meta_file = &meta_files[meta_index];
let entry = meta_file.entry(index_in_meta); let entry = meta_file.entry(index_in_meta);
let aqmf = Cow::Borrowed(entry.raw_aqmf(meta_file.aqmf_data())); let amqf = Cow::Borrowed(entry.raw_amqf(meta_file.amqf_data()));
let meta = StaticSortedFileBuilderMeta { let meta = StaticSortedFileBuilderMeta {
min_hash: entry.min_hash(), min_hash: entry.min_hash(),
max_hash: entry.max_hash(), max_hash: entry.max_hash(),
aqmf, amqf,
key_compression_dictionary_length: entry key_compression_dictionary_length: entry
.key_compression_dictionary_length(), .key_compression_dictionary_length(),
value_compression_dictionary_length: entry value_compression_dictionary_length: entry
...@@ -904,13 +904,12 @@ impl TurboPersistence { ...@@ -904,13 +904,12 @@ impl TurboPersistence {
) -> Result<(u32, File, StaticSortedFileBuilderMeta<'static>)> ) -> Result<(u32, File, StaticSortedFileBuilderMeta<'static>)>
{ {
let _span = tracing::trace_span!("write merged sst file").entered(); let _span = tracing::trace_span!("write merged sst file").entered();
let builder = StaticSortedFileBuilder::new( let (meta, file) = write_static_stored_file(
entries, entries,
total_key_size, total_key_size,
total_value_size, total_value_size,
&path.join(format!("{seq:08}.sst")),
)?; )?;
let (meta, file) =
builder.write(&path.join(format!("{seq:08}.sst")))?;
Ok((seq, file, meta)) Ok((seq, file, meta))
} }
...@@ -1148,7 +1147,7 @@ impl TurboPersistence { ...@@ -1148,7 +1147,7 @@ impl TurboPersistence {
family as u32, family as u32,
hash, hash,
key, key,
&self.aqmf_cache, &self.amqf_cache,
&self.key_block_cache, &self.key_block_cache,
&self.value_block_cache, &self.value_block_cache,
)? { )? {
...@@ -1162,7 +1161,7 @@ impl TurboPersistence { ...@@ -1162,7 +1161,7 @@ impl TurboPersistence {
} }
MetaLookupResult::QuickFilterMiss => { MetaLookupResult::QuickFilterMiss => {
#[cfg(feature = "stats")] #[cfg(feature = "stats")]
self.stats.miss_aqmf.fetch_add(1, Ordering::Relaxed); self.stats.miss_amqf.fetch_add(1, Ordering::Relaxed);
} }
MetaLookupResult::SstLookup(result) => match result { MetaLookupResult::SstLookup(result) => match result {
SstLookupResult::Found(result) => match result { SstLookupResult::Found(result) => match result {
...@@ -1204,14 +1203,14 @@ impl TurboPersistence { ...@@ -1204,14 +1203,14 @@ impl TurboPersistence {
sst_files: inner.meta_files.iter().map(|m| m.entries().len()).sum(), sst_files: inner.meta_files.iter().map(|m| m.entries().len()).sum(),
key_block_cache: CacheStatistics::new(&self.key_block_cache), key_block_cache: CacheStatistics::new(&self.key_block_cache),
value_block_cache: CacheStatistics::new(&self.value_block_cache), value_block_cache: CacheStatistics::new(&self.value_block_cache),
aqmf_cache: CacheStatistics::new(&self.aqmf_cache), amqf_cache: CacheStatistics::new(&self.amqf_cache),
hits: self.stats.hits_deleted.load(Ordering::Relaxed) hits: self.stats.hits_deleted.load(Ordering::Relaxed)
+ self.stats.hits_small.load(Ordering::Relaxed) + self.stats.hits_small.load(Ordering::Relaxed)
+ self.stats.hits_blob.load(Ordering::Relaxed), + self.stats.hits_blob.load(Ordering::Relaxed),
misses: self.stats.miss_global.load(Ordering::Relaxed), misses: self.stats.miss_global.load(Ordering::Relaxed),
miss_family: self.stats.miss_family.load(Ordering::Relaxed), miss_family: self.stats.miss_family.load(Ordering::Relaxed),
miss_range: self.stats.miss_range.load(Ordering::Relaxed), miss_range: self.stats.miss_range.load(Ordering::Relaxed),
miss_aqmf: self.stats.miss_aqmf.load(Ordering::Relaxed), miss_amqf: self.stats.miss_amqf.load(Ordering::Relaxed),
miss_key: self.stats.miss_key.load(Ordering::Relaxed), miss_key: self.stats.miss_key.load(Ordering::Relaxed),
} }
} }
...@@ -1228,14 +1227,14 @@ impl TurboPersistence { ...@@ -1228,14 +1227,14 @@ impl TurboPersistence {
.entries() .entries()
.iter() .iter()
.map(|entry| { .map(|entry| {
let aqmf = entry.raw_aqmf(meta_file.aqmf_data()); let amqf = entry.raw_amqf(meta_file.amqf_data());
MetaFileEntryInfo { MetaFileEntryInfo {
sequence_number: entry.sequence_number(), sequence_number: entry.sequence_number(),
min_hash: entry.min_hash(), min_hash: entry.min_hash(),
max_hash: entry.max_hash(), max_hash: entry.max_hash(),
sst_size: entry.size(), sst_size: entry.size(),
aqmf_size: entry.aqmf_size(), amqf_size: entry.amqf_size(),
aqmf_entries: aqmf.len(), amqf_entries: amqf.len(),
key_compression_dictionary_size: entry key_compression_dictionary_size: entry
.key_compression_dictionary_length(), .key_compression_dictionary_length(),
value_compression_dictionary_size: entry value_compression_dictionary_size: entry
...@@ -1273,8 +1272,8 @@ pub struct MetaFileEntryInfo { ...@@ -1273,8 +1272,8 @@ pub struct MetaFileEntryInfo {
pub sequence_number: u32, pub sequence_number: u32,
pub min_hash: u64, pub min_hash: u64,
pub max_hash: u64, pub max_hash: u64,
pub aqmf_size: u32, pub amqf_size: u32,
pub aqmf_entries: usize, pub amqf_entries: usize,
pub sst_size: u64, pub sst_size: u64,
pub key_compression_dictionary_size: u16, pub key_compression_dictionary_size: u16,
pub value_compression_dictionary_size: u16, pub value_compression_dictionary_size: u16,
......
...@@ -20,16 +20,16 @@ use crate::{ ...@@ -20,16 +20,16 @@ use crate::{
}; };
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct AqmfWeighter; pub struct AmqfWeighter;
impl quick_cache::Weighter<u32, Arc<qfilter::Filter>> for AqmfWeighter { impl quick_cache::Weighter<u32, Arc<qfilter::Filter>> for AmqfWeighter {
fn weight(&self, _key: &u32, filter: &Arc<qfilter::Filter>) -> u64 { fn weight(&self, _key: &u32, filter: &Arc<qfilter::Filter>) -> u64 {
filter.capacity() + 1 filter.capacity() + 1
} }
} }
pub type AqmfCache = pub type AmqfCache =
quick_cache::sync::Cache<u32, Arc<qfilter::Filter>, AqmfWeighter, BuildHasherDefault<FxHasher>>; quick_cache::sync::Cache<u32, Arc<qfilter::Filter>, AmqfWeighter, BuildHasherDefault<FxHasher>>;
pub struct MetaEntry { pub struct MetaEntry {
/// The metadata for the static sorted file. /// The metadata for the static sorted file.
...@@ -42,15 +42,15 @@ pub struct MetaEntry { ...@@ -42,15 +42,15 @@ pub struct MetaEntry {
max_hash: u64, max_hash: u64,
/// The size of the SST file in bytes. /// The size of the SST file in bytes.
size: u64, size: u64,
/// The offset of the start of the AQMF data in the meta file relative to the end of the /// The offset of the start of the AMQF data in the meta file relative to the end of the
/// header. /// header.
start_of_aqmf_data_offset: u32, start_of_amqf_data_offset: u32,
/// The offset of the end of the AQMF data in the the meta file relative to the end of the /// The offset of the end of the AMQF data in the the meta file relative to the end of the
/// header. /// header.
end_of_aqmf_data_offset: u32, end_of_amqf_data_offset: u32,
/// The AQMF filter of this file. This is only used if the range is very large. Smaller ranges /// The AMQF filter of this file. This is only used if the range is very large. Smaller ranges
/// use the AQMF cache instead. /// use the AMQF cache instead.
aqmf: OnceLock<qfilter::Filter>, amqf: OnceLock<qfilter::Filter>,
/// The static sorted file that is lazily loaded /// The static sorted file that is lazily loaded
sst: OnceLock<StaticSortedFile>, sst: OnceLock<StaticSortedFile>,
} }
...@@ -64,51 +64,51 @@ impl MetaEntry { ...@@ -64,51 +64,51 @@ impl MetaEntry {
self.size self.size
} }
pub fn aqmf_size(&self) -> u32 { pub fn amqf_size(&self) -> u32 {
self.end_of_aqmf_data_offset - self.start_of_aqmf_data_offset self.end_of_amqf_data_offset - self.start_of_amqf_data_offset
} }
pub fn raw_aqmf<'l>(&self, aqmf_data: &'l [u8]) -> &'l [u8] { pub fn raw_amqf<'l>(&self, amqf_data: &'l [u8]) -> &'l [u8] {
aqmf_data amqf_data
.get(self.start_of_aqmf_data_offset as usize..self.end_of_aqmf_data_offset as usize) .get(self.start_of_amqf_data_offset as usize..self.end_of_amqf_data_offset as usize)
.expect("AQMF data out of bounds") .expect("AMQF data out of bounds")
} }
pub fn deserialize_aqmf(&self, meta: &MetaFile) -> Result<qfilter::Filter> { pub fn deserialize_amqf(&self, meta: &MetaFile) -> Result<qfilter::Filter> {
let aqmf = self.raw_aqmf(meta.aqmf_data()); let amqf = self.raw_amqf(meta.amqf_data());
pot::from_slice(aqmf).with_context(|| { pot::from_slice(amqf).with_context(|| {
format!( format!(
"Failed to deserialize AQMF from {:08}.meta for {:08}.sst", "Failed to deserialize AMQF from {:08}.meta for {:08}.sst",
meta.sequence_number, meta.sequence_number,
self.sequence_number() self.sequence_number()
) )
}) })
} }
pub fn aqmf( pub fn amqf(
&self, &self,
meta: &MetaFile, meta: &MetaFile,
aqmf_cache: &AqmfCache, amqf_cache: &AmqfCache,
) -> Result<impl Deref<Target = qfilter::Filter>> { ) -> Result<impl Deref<Target = qfilter::Filter>> {
let use_aqmf_cache = self.max_hash - self.min_hash < 1 << 60; let use_amqf_cache = self.max_hash - self.min_hash < 1 << 60;
Ok(if use_aqmf_cache { Ok(if use_amqf_cache {
let aqmf = match aqmf_cache.get_value_or_guard(&self.sequence_number(), None) { let amqf = match amqf_cache.get_value_or_guard(&self.sequence_number(), None) {
GuardResult::Value(aqmf) => aqmf, GuardResult::Value(amqf) => amqf,
GuardResult::Guard(guard) => { GuardResult::Guard(guard) => {
let aqmf = self.deserialize_aqmf(meta)?; let amqf = self.deserialize_amqf(meta)?;
let aqmf: Arc<qfilter::Filter> = Arc::new(aqmf); let amqf: Arc<qfilter::Filter> = Arc::new(amqf);
let _ = guard.insert(aqmf.clone()); let _ = guard.insert(amqf.clone());
aqmf amqf
} }
GuardResult::Timeout => unreachable!(), GuardResult::Timeout => unreachable!(),
}; };
Either::Left(aqmf) Either::Left(amqf)
} else { } else {
let aqmf = self.aqmf.get_or_try_init(|| { let amqf = self.amqf.get_or_try_init(|| {
let aqmf = self.deserialize_aqmf(meta)?; let amqf = self.deserialize_amqf(meta)?;
anyhow::Ok(aqmf) anyhow::Ok(amqf)
})?; })?;
Either::Right(aqmf) Either::Right(amqf)
}) })
} }
...@@ -160,9 +160,9 @@ pub enum MetaLookupResult { ...@@ -160,9 +160,9 @@ pub enum MetaLookupResult {
/// The key was not found because it is out of the range of this SST file. But it was the /// The key was not found because it is out of the range of this SST file. But it was the
/// correct key family. /// correct key family.
RangeMiss, RangeMiss,
/// The key was not found because it was not in the AQMF filter. But it was in the range. /// The key was not found because it was not in the AMQF filter. But it was in the range.
QuickFilterMiss, QuickFilterMiss,
/// The key was looked up in the SST file. It was in the AQMF filter. /// The key was looked up in the SST file. It was in the AMQF filter.
SstLookup(SstLookupResult), SstLookup(SstLookupResult),
} }
...@@ -216,7 +216,7 @@ impl MetaFile { ...@@ -216,7 +216,7 @@ impl MetaFile {
} }
let count = file.read_u32::<BE>()?; let count = file.read_u32::<BE>()?;
let mut entries = Vec::with_capacity(count as usize); let mut entries = Vec::with_capacity(count as usize);
let mut start_of_aqmf_data_offset = 0; let mut start_of_amqf_data_offset = 0;
for _ in 0..count { for _ in 0..count {
let entry = MetaEntry { let entry = MetaEntry {
sst_data: StaticSortedFileMetaData { sst_data: StaticSortedFileMetaData {
...@@ -229,12 +229,12 @@ impl MetaFile { ...@@ -229,12 +229,12 @@ impl MetaFile {
min_hash: file.read_u64::<BE>()?, min_hash: file.read_u64::<BE>()?,
max_hash: file.read_u64::<BE>()?, max_hash: file.read_u64::<BE>()?,
size: file.read_u64::<BE>()?, size: file.read_u64::<BE>()?,
start_of_aqmf_data_offset, start_of_amqf_data_offset,
end_of_aqmf_data_offset: file.read_u32::<BE>()?, end_of_amqf_data_offset: file.read_u32::<BE>()?,
aqmf: OnceLock::new(), amqf: OnceLock::new(),
sst: OnceLock::new(), sst: OnceLock::new(),
}; };
start_of_aqmf_data_offset = entry.end_of_aqmf_data_offset; start_of_amqf_data_offset = entry.end_of_amqf_data_offset;
entries.push(entry); entries.push(entry);
} }
let offset = file.stream_position()?; let offset = file.stream_position()?;
...@@ -273,7 +273,7 @@ impl MetaFile { ...@@ -273,7 +273,7 @@ impl MetaFile {
&self.entries[index] &self.entries[index]
} }
pub fn aqmf_data(&self) -> &[u8] { pub fn amqf_data(&self) -> &[u8] {
&self.mmap &self.mmap
} }
...@@ -307,7 +307,7 @@ impl MetaFile { ...@@ -307,7 +307,7 @@ impl MetaFile {
key_family: u32, key_family: u32,
key_hash: u64, key_hash: u64,
key: &K, key: &K,
aqmf_cache: &AqmfCache, amqf_cache: &AmqfCache,
key_block_cache: &BlockCache, key_block_cache: &BlockCache,
value_block_cache: &BlockCache, value_block_cache: &BlockCache,
) -> Result<MetaLookupResult> { ) -> Result<MetaLookupResult> {
...@@ -320,8 +320,8 @@ impl MetaFile { ...@@ -320,8 +320,8 @@ impl MetaFile {
continue; continue;
} }
{ {
let aqmf = entry.aqmf(self, aqmf_cache)?; let amqf = entry.amqf(self, amqf_cache)?;
if !aqmf.contains_fingerprint(key_hash) { if !amqf.contains_fingerprint(key_hash) {
miss_result = MetaLookupResult::QuickFilterMiss; miss_result = MetaLookupResult::QuickFilterMiss;
continue; continue;
} }
......
...@@ -54,7 +54,7 @@ impl<'a> MetaFileBuilder<'a> { ...@@ -54,7 +54,7 @@ impl<'a> MetaFileBuilder<'a> {
file.write_u32::<BE>(self.entries.len() as u32)?; file.write_u32::<BE>(self.entries.len() as u32)?;
let mut aqmf_offset = 0; let mut amqf_offset = 0;
for (sequence_number, sst) in &self.entries { for (sequence_number, sst) in &self.entries {
file.write_u32::<BE>(*sequence_number)?; file.write_u32::<BE>(*sequence_number)?;
file.write_u16::<BE>(sst.key_compression_dictionary_length)?; file.write_u16::<BE>(sst.key_compression_dictionary_length)?;
...@@ -63,12 +63,12 @@ impl<'a> MetaFileBuilder<'a> { ...@@ -63,12 +63,12 @@ impl<'a> MetaFileBuilder<'a> {
file.write_u64::<BE>(sst.min_hash)?; file.write_u64::<BE>(sst.min_hash)?;
file.write_u64::<BE>(sst.max_hash)?; file.write_u64::<BE>(sst.max_hash)?;
file.write_u64::<BE>(sst.size)?; file.write_u64::<BE>(sst.size)?;
aqmf_offset += sst.aqmf.len(); amqf_offset += sst.amqf.len();
file.write_u32::<BE>(aqmf_offset as u32)?; file.write_u32::<BE>(amqf_offset as u32)?;
} }
for (_, sst) in &self.entries { for (_, sst) in &self.entries {
file.write_all(&sst.aqmf)?; file.write_all(&sst.amqf)?;
} }
Ok(file.into_inner()?) Ok(file.into_inner()?)
} }
......
...@@ -26,7 +26,7 @@ use crate::{ ...@@ -26,7 +26,7 @@ use crate::{
constants::{MAX_MEDIUM_VALUE_SIZE, THREAD_LOCAL_SIZE_SHIFT}, constants::{MAX_MEDIUM_VALUE_SIZE, THREAD_LOCAL_SIZE_SHIFT},
key::StoreKey, key::StoreKey,
meta_file_builder::MetaFileBuilder, meta_file_builder::MetaFileBuilder,
static_sorted_file_builder::{StaticSortedFileBuilder, StaticSortedFileBuilderMeta}, static_sorted_file_builder::{StaticSortedFileBuilderMeta, write_static_stored_file},
}; };
/// The thread local state of a `WriteBatch`. `FAMILIES` should fit within a `u32`. /// The thread local state of a `WriteBatch`. `FAMILIES` should fit within a `u32`.
...@@ -408,12 +408,10 @@ impl<K: StoreKey + Send + Sync, const FAMILIES: usize> WriteBatch<K, FAMILIES> { ...@@ -408,12 +408,10 @@ impl<K: StoreKey + Send + Sync, const FAMILIES: usize> WriteBatch<K, FAMILIES> {
let (entries, total_key_size, total_value_size) = collector_data; let (entries, total_key_size, total_value_size) = collector_data;
let seq = self.current_sequence_number.fetch_add(1, Ordering::SeqCst) + 1; let seq = self.current_sequence_number.fetch_add(1, Ordering::SeqCst) + 1;
let builder = StaticSortedFileBuilder::new(entries, total_key_size, total_value_size)?;
let path = self.db_path.join(format!("{seq:08}.sst")); let path = self.db_path.join(format!("{seq:08}.sst"));
let (meta, file) = builder let (meta, file) =
.write(&path) write_static_stored_file(entries, total_key_size, total_value_size, &path)
.with_context(|| format!("Unable to write SST file {seq:08}.sst"))?; .with_context(|| format!("Unable to write SST file {seq:08}.sst"))?;
#[cfg(feature = "verify_sst_content")] #[cfg(feature = "verify_sst_content")]
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment