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 734799886D for ; Mon, 9 Oct 2023 13:52:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A891D16BF9 for ; Mon, 9 Oct 2023 13:52:12 +0200 (CEST) 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 ; Mon, 9 Oct 2023 13:52:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7E77544928 for ; Mon, 9 Oct 2023 13:52:09 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 9 Oct 2023 13:51:24 +0200 Message-Id: <20231009115139.1417886-9-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009115139.1417886-1-c.ebner@proxmox.com> References: <20231009115139.1417886-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 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 Subject: [pbs-devel] [RFC v2 proxmox-backup 08/23] 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: Mon, 09 Oct 2023 11:52:43 -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 version 1: - remove unneeded total size calculation, not needed pbs-datastore/src/dynamic_index.rs | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pbs-datastore/src/dynamic_index.rs b/pbs-datastore/src/dynamic_index.rs index 71a5082e..11b8381d 100644 --- a/pbs-datastore/src/dynamic_index.rs +++ b/pbs-datastore/src/dynamic_index.rs @@ -188,6 +188,38 @@ 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), 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 mut indices = Vec::new(); + let mut prev_end = offset_first; + for dynamic_entry in &self.index[start..end + 1] { + let mut dynamic_entry = dynamic_entry.clone(); + // Normalize end to be equal to size + dynamic_entry.end_le -= prev_end; + prev_end += dynamic_entry.end_le; + indices.push(dynamic_entry); + } + + Ok((indices, padding_start)) + } } impl IndexFile for DynamicIndexReader { -- 2.39.2