[pbs-devel] applied: [PATCH v5 proxmox-backup 2/4] add ctime and size function to IndexFile trait

[Wolfgang Bumiller]

On Thu, Apr 29, 2021 at 01:00:14PM +0200, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
> needed for next patch in order to avoid duplicating code for fixed and
> dynamic indexes
> 
>  src/backup/dynamic_index.rs | 8 ++++++++
>  src/backup/fixed_index.rs   | 8 ++++++++
>  src/backup/index.rs         | 2 ++
>  3 files changed, 18 insertions(+)
> 
> diff --git a/src/backup/dynamic_index.rs b/src/backup/dynamic_index.rs
> index 1619d8db..8321b295 100644
> --- a/src/backup/dynamic_index.rs
> +++ b/src/backup/dynamic_index.rs
> @@ -233,6 +233,14 @@ impl IndexFile for DynamicIndexReader {
>          })
>      }
>  
> +    fn index_ctime(&self) -> i64 {
> +        self.ctime
> +    }
> +
> +    fn index_size(&self) -> usize {
> +        self.size as usize
> +    }
> +
>      fn chunk_from_offset(&self, offset: u64) -> Option<(usize, u64)> {
>          let end_idx = self.index.len() - 1;
>          let end = self.chunk_end(end_idx);
> diff --git a/src/backup/fixed_index.rs b/src/backup/fixed_index.rs
> index ceb6fe29..ebf64456 100644
> --- a/src/backup/fixed_index.rs
> +++ b/src/backup/fixed_index.rs
> @@ -193,6 +193,14 @@ impl IndexFile for FixedIndexReader {
>          })
>      }
>  
> +    fn index_ctime(&self) -> i64 {
> +        self.ctime
> +    }
> +
> +    fn index_size(&self) -> usize {
> +        self.size as usize
> +    }
> +
>      fn compute_csum(&self) -> ([u8; 32], u64) {
>          let mut csum = openssl::sha::Sha256::new();
>          let mut chunk_end = 0;
> diff --git a/src/backup/index.rs b/src/backup/index.rs
> index c6bab56e..69788f80 100644
> --- a/src/backup/index.rs
> +++ b/src/backup/index.rs
> @@ -22,6 +22,8 @@ pub trait IndexFile {
>      fn index_digest(&self, pos: usize) -> Option<&[u8; 32]>;
>      fn index_bytes(&self) -> u64;
>      fn chunk_info(&self, pos: usize) -> Option<ChunkReadInfo>;
> +    fn index_ctime(&self) -> i64;
> +    fn index_size(&self) -> usize;
>  
>      /// Get the chunk index and the relative offset within it for a byte offset
>      fn chunk_from_offset(&self, offset: u64) -> Option<(usize, u64)>;
> -- 
> 2.20.1