From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 42DFA90A7D for ; Thu, 25 Jan 2024 14:26:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6DC3119973 for ; Thu, 25 Jan 2024 14:26:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 25 Jan 2024 14:26:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 75D5F492BE for ; Thu, 25 Jan 2024 14:26:25 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 25 Jan 2024 14:25:49 +0100 Message-Id: <20240125132608.1172472-11-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240125132608.1172472-1-c.ebner@proxmox.com> References: <20240125132608.1172472-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v6 proxmox-backup 10/29] fix #3174: index: add fn index list from start/end-offsets X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2024 13:26:27 -0000 Adds a function to get a list of DynamicEntry's from a chunk index by given start and end offset, which should be contained within these chunks. This is needed in order to reference file payloads and reuse the chunks containing them from a previous backup run. The index entries are normalized, meaning each entries end() is equal to the chunk size. In addition to the list of index entries, the padding to the start of the requested start offset from the first chunk is returned. This is needed for calculation of the appendix section offsets during decoding. Signed-off-by: Christian Ebner --- Changes since v5: - Introduce dedicated `AppendableDynamicEntry` to distinguish from regular `DynamicEntry` objects. Refactor accordingly. pbs-datastore/src/dynamic_index.rs | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/pbs-datastore/src/dynamic_index.rs b/pbs-datastore/src/dynamic_index.rs index 71a5082e..a4d8ceec 100644 --- a/pbs-datastore/src/dynamic_index.rs +++ b/pbs-datastore/src/dynamic_index.rs @@ -74,6 +74,26 @@ impl DynamicEntry { } } +/// Dynamic Entry appendable as pxar Appendix entry +#[derive(Clone, Debug)] +#[repr(C)] +pub struct AppendableDynamicEntry { + size_le: u64, + digest: [u8; 32], +} + +impl AppendableDynamicEntry { + #[inline] + pub fn size(&self) -> u64 { + u64::from_le(self.size_le) + } + + #[inline] + pub fn digest(&self) -> [u8; 32] { + self.digest.clone() + } +} + pub struct DynamicIndexReader { _file: File, pub size: usize, @@ -188,6 +208,41 @@ impl DynamicIndexReader { self.binary_search(middle_idx + 1, middle_end, end_idx, end, offset) } } + + /// List of chunk indices containing the data from start_offset to end_offset + pub fn indices( + &self, + start_offset: u64, + end_offset: u64, + ) -> Result<(Vec, u64, u64), Error> { + let end_idx = self.index.len() - 1; + let chunk_end = self.chunk_end(end_idx); + let start = self.binary_search(0, 0, end_idx, chunk_end, start_offset)?; + let end = self.binary_search(0, 0, end_idx, chunk_end, end_offset)?; + + let offset_first = if start == 0 { + 0 + } else { + self.index[start - 1].end() + }; + + let padding_start = start_offset - offset_first; + let padding_end = self.index[end].end() - end_offset; + + let mut indices = Vec::new(); + let mut prev_end = offset_first; + for dynamic_entry in &self.index[start..end + 1] { + let size = dynamic_entry.end() - prev_end; + let appendable_dynamic_entry = AppendableDynamicEntry { + size_le: size.to_le(), + digest: dynamic_entry.digest.clone(), + }; + prev_end += size; + indices.push(appendable_dynamic_entry); + } + + Ok((indices, padding_start, padding_end)) + } } impl IndexFile for DynamicIndexReader { -- 2.39.2