32c96701c8
- Add CdcChunker using FastCDC v3 (16KB/64KB/256KB chunks) - Add DeltaDetector with scan_origin() returning ScannedFile (no FileId assignment) - Add OriginWatcher with inotify and 200ms debounce using tokio::spawn - Fix LocalOrigin::read() to loop until all bytes read - Add read_full() method to Origin trait - Add mtime field to ChunkManifest - Update ContentFetcher to use CDC chunking - Update bandwidth reduction test to assert >90% (NFR-6.4) Tests: 71 pass (+11 new)
295 lines
8.2 KiB
Rust
295 lines
8.2 KiB
Rust
use crate::chunks::ChunkRef;
|
|
use crate::fetcher::{ContentFetcher, FetchError};
|
|
use crate::store::CasStore;
|
|
use bytes::{Bytes, BytesMut};
|
|
use musicfs_core::FileId;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::collections::HashMap;
|
|
use std::sync::{Arc, RwLock};
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ChunkManifest {
|
|
pub file_id: FileId,
|
|
pub total_size: u64,
|
|
pub mtime: i64,
|
|
pub chunks: Vec<ChunkRef>,
|
|
}
|
|
|
|
impl ChunkManifest {
|
|
pub fn chunks_to_bytes(&self) -> Vec<u8> {
|
|
rmp_serde::to_vec(&self.chunks).unwrap_or_default()
|
|
}
|
|
|
|
pub fn chunks_from_bytes(data: &[u8]) -> Option<Vec<ChunkRef>> {
|
|
rmp_serde::from_slice(data).ok()
|
|
}
|
|
|
|
pub fn from_db(file_id: FileId, total_size: u64, mtime: i64, chunk_blob: &[u8]) -> Option<Self> {
|
|
let chunks = Self::chunks_from_bytes(chunk_blob)?;
|
|
Some(Self {
|
|
file_id,
|
|
total_size,
|
|
mtime,
|
|
chunks,
|
|
})
|
|
}
|
|
}
|
|
|
|
pub struct FileReader {
|
|
store: Arc<CasStore>,
|
|
fetcher: Option<Arc<ContentFetcher>>,
|
|
manifests: RwLock<HashMap<FileId, ChunkManifest>>,
|
|
}
|
|
|
|
impl FileReader {
|
|
pub fn new(store: Arc<CasStore>) -> Self {
|
|
Self {
|
|
store,
|
|
fetcher: None,
|
|
manifests: RwLock::new(HashMap::new()),
|
|
}
|
|
}
|
|
|
|
pub fn with_fetcher(store: Arc<CasStore>, fetcher: Arc<ContentFetcher>) -> Self {
|
|
Self {
|
|
store,
|
|
fetcher: Some(fetcher),
|
|
manifests: RwLock::new(HashMap::new()),
|
|
}
|
|
}
|
|
|
|
pub fn register_manifest(&self, manifest: ChunkManifest) {
|
|
let mut manifests = self.manifests.write().unwrap();
|
|
manifests.insert(manifest.file_id, manifest);
|
|
}
|
|
|
|
async fn get_or_fetch_manifest(&self, file_id: FileId) -> Result<ChunkManifest, ReaderError> {
|
|
{
|
|
let manifests = self.manifests.read().unwrap();
|
|
if let Some(m) = manifests.get(&file_id) {
|
|
return Ok(m.clone());
|
|
}
|
|
}
|
|
|
|
let Some(fetcher) = &self.fetcher else {
|
|
return Err(ReaderError::ManifestNotFound(file_id));
|
|
};
|
|
|
|
let manifest = fetcher.ensure_cached(file_id).await?;
|
|
self.manifests
|
|
.write()
|
|
.unwrap()
|
|
.insert(file_id, manifest.clone());
|
|
Ok(manifest)
|
|
}
|
|
|
|
pub async fn read(
|
|
&self,
|
|
file_id: FileId,
|
|
offset: u64,
|
|
size: u32,
|
|
) -> Result<Bytes, ReaderError> {
|
|
let manifest = self.get_or_fetch_manifest(file_id).await?;
|
|
|
|
if let Some(fetcher) = &self.fetcher {
|
|
if let Some(meta) = fetcher.get_file_meta(file_id) {
|
|
fetcher.emit_access_event(&meta, offset, size);
|
|
}
|
|
}
|
|
|
|
if offset >= manifest.total_size {
|
|
return Ok(Bytes::new());
|
|
}
|
|
|
|
let end = std::cmp::min(offset + size as u64, manifest.total_size);
|
|
let mut result = BytesMut::with_capacity((end - offset) as usize);
|
|
|
|
for chunk_ref in &manifest.chunks {
|
|
let chunk_start = chunk_ref.offset;
|
|
let chunk_end = chunk_ref.offset + chunk_ref.size as u64;
|
|
|
|
if chunk_end <= offset || chunk_start >= end {
|
|
continue;
|
|
}
|
|
|
|
let chunk_data = self.store.get(&chunk_ref.hash).await?;
|
|
|
|
let read_start = if offset > chunk_start {
|
|
(offset - chunk_start) as usize
|
|
} else {
|
|
0
|
|
};
|
|
|
|
let read_end = if end < chunk_end {
|
|
(end - chunk_start) as usize
|
|
} else {
|
|
chunk_ref.size as usize
|
|
};
|
|
|
|
result.extend_from_slice(&chunk_data[read_start..read_end]);
|
|
}
|
|
|
|
Ok(result.freeze())
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum ReaderError {
|
|
#[error("Manifest not found for file {0:?}")]
|
|
ManifestNotFound(FileId),
|
|
|
|
#[error("Fetch error: {0}")]
|
|
Fetch(#[from] FetchError),
|
|
|
|
#[error("CAS error: {0}")]
|
|
Cas(#[from] crate::store::CasError),
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::store::CasConfig;
|
|
use musicfs_core::ChunkHash;
|
|
use tempfile::TempDir;
|
|
|
|
#[tokio::test]
|
|
async fn test_file_reader_simple() {
|
|
let dir = TempDir::new().unwrap();
|
|
let config = CasConfig {
|
|
chunks_dir: dir.path().join("chunks"),
|
|
..Default::default()
|
|
};
|
|
let store = Arc::new(CasStore::open(config).await.unwrap());
|
|
|
|
let data = b"Hello, World!";
|
|
let hash = store.put(data).await.unwrap();
|
|
|
|
let reader = FileReader::new(store);
|
|
reader.register_manifest(ChunkManifest {
|
|
file_id: FileId(1),
|
|
total_size: data.len() as u64,
|
|
mtime: 0,
|
|
chunks: vec![ChunkRef {
|
|
hash,
|
|
offset: 0,
|
|
size: data.len() as u32,
|
|
}],
|
|
});
|
|
|
|
let result = reader.read(FileId(1), 0, data.len() as u32).await.unwrap();
|
|
assert_eq!(&result[..], data);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_file_reader_partial() {
|
|
let dir = TempDir::new().unwrap();
|
|
let config = CasConfig {
|
|
chunks_dir: dir.path().join("chunks"),
|
|
..Default::default()
|
|
};
|
|
let store = Arc::new(CasStore::open(config).await.unwrap());
|
|
|
|
let data = b"ABCDEFGHIJ";
|
|
let hash = store.put(data).await.unwrap();
|
|
|
|
let reader = FileReader::new(store);
|
|
reader.register_manifest(ChunkManifest {
|
|
file_id: FileId(1),
|
|
total_size: data.len() as u64,
|
|
mtime: 0,
|
|
chunks: vec![ChunkRef {
|
|
hash,
|
|
offset: 0,
|
|
size: data.len() as u32,
|
|
}],
|
|
});
|
|
|
|
let result = reader.read(FileId(1), 3, 4).await.unwrap();
|
|
assert_eq!(&result[..], b"DEFG");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_file_reader_multi_chunk() {
|
|
let dir = TempDir::new().unwrap();
|
|
let config = CasConfig {
|
|
chunks_dir: dir.path().join("chunks"),
|
|
..Default::default()
|
|
};
|
|
let store = Arc::new(CasStore::open(config).await.unwrap());
|
|
|
|
let chunk1 = b"AAAA";
|
|
let chunk2 = b"BBBB";
|
|
let hash1 = store.put(chunk1).await.unwrap();
|
|
let hash2 = store.put(chunk2).await.unwrap();
|
|
|
|
let reader = FileReader::new(store);
|
|
reader.register_manifest(ChunkManifest {
|
|
file_id: FileId(1),
|
|
total_size: 8,
|
|
mtime: 0,
|
|
chunks: vec![
|
|
ChunkRef {
|
|
hash: hash1,
|
|
offset: 0,
|
|
size: 4,
|
|
},
|
|
ChunkRef {
|
|
hash: hash2,
|
|
offset: 4,
|
|
size: 4,
|
|
},
|
|
],
|
|
});
|
|
|
|
let result = reader.read(FileId(1), 2, 4).await.unwrap();
|
|
assert_eq!(&result[..], b"AABB");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_file_reader_eof() {
|
|
let dir = TempDir::new().unwrap();
|
|
let config = CasConfig {
|
|
chunks_dir: dir.path().join("chunks"),
|
|
..Default::default()
|
|
};
|
|
let store = Arc::new(CasStore::open(config).await.unwrap());
|
|
|
|
let data = b"short";
|
|
let hash = store.put(data).await.unwrap();
|
|
|
|
let reader = FileReader::new(store);
|
|
reader.register_manifest(ChunkManifest {
|
|
file_id: FileId(1),
|
|
total_size: data.len() as u64,
|
|
mtime: 0,
|
|
chunks: vec![ChunkRef {
|
|
hash,
|
|
offset: 0,
|
|
size: data.len() as u32,
|
|
}],
|
|
});
|
|
|
|
let result = reader.read(FileId(1), 100, 10).await.unwrap();
|
|
assert!(result.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn test_chunk_manifest_serialization() {
|
|
let manifest = ChunkManifest {
|
|
file_id: FileId(42),
|
|
total_size: 1024,
|
|
mtime: 0,
|
|
chunks: vec![ChunkRef {
|
|
hash: ChunkHash::from_bytes(b"test"),
|
|
offset: 0,
|
|
size: 1024,
|
|
}],
|
|
};
|
|
|
|
let bytes = manifest.chunks_to_bytes();
|
|
let restored = ChunkManifest::chunks_from_bytes(&bytes).unwrap();
|
|
assert_eq!(restored.len(), 1);
|
|
assert_eq!(restored[0].size, 1024);
|
|
}
|
|
}
|