use failure::*;
+use std::convert::TryInto;
use crate::tools;
use super::IndexFile;
use proxmox_protocol::Chunker;
use std::sync::Arc;
-use std::io::{Read, Write, BufWriter};
+use std::io::{Write, BufWriter};
use std::fs::File;
use std::path::{Path, PathBuf};
use std::os::unix::io::AsRawFd;
use crate::tools::io::ops::*;
use crate::tools::vec;
+use super::{DataChunk, DataChunkBuilder};
+
/// Header format definition for dynamic index files (`.dixd`)
#[repr(C)]
pub struct DynamicIndexHeader {
}
#[inline]
- fn chunk_digest(&self, pos: usize) -> &[u8] {
+ fn chunk_digest(&self, pos: usize) -> &[u8; 32] {
if pos >= self.index_entries {
panic!("chunk index out of range");
}
- unsafe { std::slice::from_raw_parts(self.index.add(pos*40+8), 32) }
+ let slice = unsafe { std::slice::from_raw_parts(self.index.add(pos*40+8), 32) };
+ slice.try_into().unwrap()
}
pub fn mark_used_chunks(&self, _status: &mut GarbageCollectionStatus) -> Result<(), Error> {
Ok(())
}
- pub fn dump_pxar(&self, mut writer: Box<Write>) -> Result<(), Error> {
-
- let mut buffer = Vec::with_capacity(1024*1024);
+ pub fn dump_pxar(&self, mut writer: Box<dyn Write>) -> Result<(), Error> {
for pos in 0..self.index_entries {
let _end = self.chunk_end(pos);
let digest = self.chunk_digest(pos);
//println!("Dump {:08x}", end );
- self.store.read_chunk(digest, &mut buffer)?;
- writer.write_all(&buffer)?;
-
+ let chunk = self.store.read_chunk(digest)?;
+ // fimxe: handle encrypted chunks
+ let data = chunk.decode(None)?;
+ writer.write_all(&data)?;
}
Ok(())
let index = &self.index;
let end = index.chunk_end(idx);
let digest = index.chunk_digest(idx);
- index.store.read_chunk(digest, &mut self.read_buffer)?;
+
+ let chunk = index.store.read_chunk(digest)?;
+ // fimxe: handle encrypted chunks
+ // fixme: avoid copy
+ let data = chunk.decode(None)?;
+
+ self.read_buffer.clear();
+ self.read_buffer.extend_from_slice(&data);
self.buffered_chunk_idx = idx;
self.buffered_chunk_start = end - (self.read_buffer.len() as u64);
}
}
+/// Create dynamic index files (`.dixd`)
pub struct DynamicIndexWriter {
store: Arc<ChunkStore>,
_lock: tools::ProcessLockSharedGuard,
-
- chunker: Chunker,
writer: BufWriter<File>,
closed: bool,
filename: PathBuf,
tmp_filename: PathBuf,
pub uuid: [u8; 16],
pub ctime: u64,
-
- stat: ChunkStat,
-
- chunk_offset: usize,
- last_chunk: usize,
- chunk_buffer: Vec<u8>,
}
impl Drop for DynamicIndexWriter {
impl DynamicIndexWriter {
- pub fn create(store: Arc<ChunkStore>, path: &Path, chunk_size: usize) -> Result<Self, Error> {
+ pub fn create(store: Arc<ChunkStore>, path: &Path) -> Result<Self, Error> {
let shared_lock = store.try_shared_lock()?;
Ok(Self {
store,
_lock: shared_lock,
- chunker: Chunker::new(chunk_size),
writer: writer,
closed: false,
filename: full_path,
tmp_filename: tmp_path,
ctime,
uuid: *uuid.as_bytes(),
-
- stat: ChunkStat::new(0),
-
- chunk_offset: 0,
- last_chunk: 0,
- chunk_buffer: Vec::with_capacity(chunk_size*4),
})
}
+ // fixme: use add_chunk instead?
+ pub fn insert_chunk(&self, chunk: &DataChunk) -> Result<(bool, u64), Error> {
+ self.store.insert_chunk(chunk)
+ }
+
pub fn close(&mut self) -> Result<(), Error> {
if self.closed {
self.closed = true;
- self.write_chunk_buffer()?;
-
self.writer.flush()?;
- self.stat.size = self.chunk_offset as u64;
-
- // add size of index file
- self.stat.size += (self.stat.chunk_count*40 + std::mem::size_of::<DynamicIndexHeader>()) as u64;
-
- println!("STAT: {:?}", self.stat);
-
- // fixme:
-
if let Err(err) = std::fs::rename(&self.tmp_filename, &self.filename) {
bail!("Atomic rename file {:?} failed - {}", self.filename, err);
}
Ok(())
}
+ // fixme: rename to add_digest
+ pub fn add_chunk(&mut self, offset: u64, digest: &[u8; 32]) -> Result<(), Error> {
+ if self.closed {
+ bail!("cannot write to closed dynamic index file {:?}", self.filename);
+ }
+ self.writer.write(unsafe { &std::mem::transmute::<u64, [u8;8]>(offset.to_le()) })?;
+ self.writer.write(digest)?;
+ Ok(())
+ }
+}
+
+/// Writer which splits a binary stream into dynamic sized chunks
+///
+/// And store the resulting chunk list into the index file.
+pub struct DynamicChunkWriter {
+ index: DynamicIndexWriter,
+ closed: bool,
+ chunker: Chunker,
+ stat: ChunkStat,
+ chunk_offset: usize,
+ last_chunk: usize,
+ chunk_buffer: Vec<u8>,
+}
+
+impl DynamicChunkWriter {
+
+ pub fn new(index: DynamicIndexWriter, chunk_size: usize) -> Self {
+ Self {
+ index,
+ closed: false,
+ chunker: Chunker::new(chunk_size),
+ stat: ChunkStat::new(0),
+ chunk_offset: 0,
+ last_chunk: 0,
+ chunk_buffer: Vec::with_capacity(chunk_size*4),
+ }
+ }
+
pub fn stat(&self) -> &ChunkStat {
&self.stat
}
- fn write_chunk_buffer(&mut self) -> Result<(), std::io::Error> {
+ pub fn close(&mut self) -> Result<(), Error> {
- use std::io::{Error, ErrorKind};
+ if self.closed {
+ return Ok(());
+ }
+
+ self.closed = true;
+
+ self.write_chunk_buffer()?;
+
+ self.index.close()?;
+
+ self.stat.size = self.chunk_offset as u64;
+
+ // add size of index file
+ self.stat.size += (self.stat.chunk_count*40 + std::mem::size_of::<DynamicIndexHeader>()) as u64;
+
+ Ok(())
+ }
+
+ fn write_chunk_buffer(&mut self) -> Result<(), Error> {
let chunk_size = self.chunk_buffer.len();
let expected_chunk_size = self.chunk_offset - self.last_chunk;
if expected_chunk_size != self.chunk_buffer.len() {
- return Err(Error::new(
- ErrorKind::Other,
- format!("wrong chunk size {} != {}", expected_chunk_size, chunk_size)));
+ bail!("wrong chunk size {} != {}", expected_chunk_size, chunk_size);
}
self.stat.chunk_count += 1;
self.last_chunk = self.chunk_offset;
- match self.store.insert_chunk(&self.chunk_buffer) {
- Ok((is_duplicate, digest, compressed_size)) => {
+ let chunk = DataChunkBuilder::new(&self.chunk_buffer)
+ .compress(true)
+ .build()?;
+
+ let digest = chunk.digest();
+
+ match self.index.insert_chunk(&chunk) {
+ Ok((is_duplicate, compressed_size)) => {
self.stat.compressed_size += compressed_size;
if is_duplicate {
}
println!("ADD CHUNK {:016x} {} {}% {} {}", self.chunk_offset, chunk_size,
- (compressed_size*100)/(chunk_size as u64), is_duplicate, tools::digest_to_hex(&digest));
- self.add_chunk(self.chunk_offset as u64, &digest)?;
+ (compressed_size*100)/(chunk_size as u64), is_duplicate, tools::digest_to_hex(digest));
+ self.index.add_chunk(self.chunk_offset as u64, &digest)?;
self.chunk_buffer.truncate(0);
return Ok(());
}
Err(err) => {
self.chunk_buffer.truncate(0);
- return Err(Error::new(ErrorKind::Other, err.to_string()));
+ return Err(err);
}
}
}
-
- pub fn add_chunk(&mut self, offset: u64, digest: &[u8; 32]) -> Result<(), std::io::Error> {
- self.writer.write(unsafe { &std::mem::transmute::<u64, [u8;8]>(offset.to_le()) })?;
- self.writer.write(digest)?;
- Ok(())
- }
}
-impl Write for DynamicIndexWriter {
+impl Write for DynamicChunkWriter {
fn write(&mut self, data: &[u8]) -> std::result::Result<usize, std::io::Error> {
self.chunk_buffer.extend(&data[0..pos]);
self.chunk_offset += pos;
- self.write_chunk_buffer()?;
+ if let Err(err) = self.write_chunk_buffer() {
+ return Err(std::io::Error::new(std::io::ErrorKind::Other, err.to_string()));
+ }
Ok(pos)
} else {
}
fn flush(&mut self) -> std::result::Result<(), std::io::Error> {
-
- use std::io::{Error, ErrorKind};
-
- Err(Error::new(ErrorKind::Other, "please use close() instead of flush()"))
+ Err(std::io::Error::new(std::io::ErrorKind::Other, "please use close() instead of flush()"))
}
}