From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH v5 proxmox-backup 2/4] add ctime and size function to IndexFile trait
Date: Fri, 30 Apr 2021 11:41:34 +0200 [thread overview]
Message-ID: <20210430094134.2uu22su7wb3hklgk@wobu-vie.proxmox.com> (raw)
In-Reply-To: <20210429110016.1467670-3-h.laimer@proxmox.com>
On Thu, Apr 29, 2021 at 01:00:14PM +0200, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@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
next prev parent reply other threads:[~2021-04-30 9:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 11:00 [pbs-devel] [PATCH v5 proxmox-backup 0/4] add proxmox-backup-debug binary Hannes Laimer
2021-04-29 11:00 ` [pbs-devel] [PATCH v5 proxmox-backup 1/4] add chunk inspection to pb-debug Hannes Laimer
2021-04-30 9:39 ` Wolfgang Bumiller
2021-04-29 11:00 ` [pbs-devel] [PATCH v5 proxmox-backup 2/4] add ctime and size function to IndexFile trait Hannes Laimer
2021-04-30 9:41 ` Wolfgang Bumiller [this message]
2021-04-29 11:00 ` [pbs-devel] [PATCH v5 proxmox-backup 3/4] add file inspection to pb-debug Hannes Laimer
2021-04-30 9:44 ` Wolfgang Bumiller
2021-04-29 11:00 ` [pbs-devel] [PATCH v5 proxmox-backup 4/4] add index recovery " Hannes Laimer
2021-04-30 9:55 ` Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430094134.2uu22su7wb3hklgk@wobu-vie.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox