From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8E0621FF13B for ; Tue, 13 Jan 2026 11:24:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D2F41433F; Tue, 13 Jan 2026 11:24:45 +0100 (CET) Date: Tue, 13 Jan 2026 11:24:39 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20251211153835.180405-1-c.ebner@proxmox.com> <20251211153835.180405-6-c.ebner@proxmox.com> In-Reply-To: <20251211153835.180405-6-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1768298258.3pgg0jpwrt.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768299837908 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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: Re: [pbs-devel] [PATCH proxmox-backup v2 5/8] chunk store: refactor chunk extension parsing into dedicated helper 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On December 11, 2025 4:38 pm, Christian Ebner wrote: > Move the chunk filename extension parsing into a dedicated helper. > > Signed-off-by: Christian Ebner > --- > pbs-datastore/src/chunk_store.rs | 36 ++++++++++++++++++-------------- > 1 file changed, 20 insertions(+), 16 deletions(-) > > diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs > index ad517391d..e05e67dfe 100644 > --- a/pbs-datastore/src/chunk_store.rs > +++ b/pbs-datastore/src/chunk_store.rs > @@ -320,22 +320,8 @@ impl ChunkStore { > // skip files if they're not a hash > let bytes = entry.file_name().to_bytes(); > > - if bytes.len() == 64 && bytes.iter().take(64).all(u8::is_ascii_hexdigit) > - { > - return Some((Ok(entry), percentage, ChunkExt::None)); > - } > - > - if bytes.len() == 64 + ".0.bad".len() > - && bytes.iter().take(64).all(u8::is_ascii_hexdigit) > - { > - let chunk_ext = if bytes.ends_with(b".bad") { > - ChunkExt::Bad > - } else if bytes.ends_with(USING_MARKER_FILENAME_EXT.as_bytes()) { > - ChunkExt::UsedMarker > - } else { > - continue; > - }; > - return Some((Ok(entry), percentage, chunk_ext)); > + if let Some(ext) = ChunkExt::from_raw_filename(bytes) { > + return Some((Ok(entry), percentage, ext)); > } > > continue; > @@ -932,6 +918,24 @@ impl ChunkExt { > fn is_used_marker(&self) -> bool { > *self == Self::UsedMarker > } > + > + fn from_raw_filename(filename: &[u8]) -> Option { > + if filename.len() == 64 && filename.iter().take(64).all(u8::is_ascii_hexdigit) the hexdigit part should still be above, and not in this helper.. > + { > + return Some(Self::None); > + } > + > + if filename.len() == 64 + ".0.bad".len() > + && filename.iter().take(64).all(u8::is_ascii_hexdigit) and like I commented on the earlier patch, the hexdigit check doesn't need to be done twice.. and this part here should check for each suffix separately: if filename.len() == 64 { return Some(Self::None); } if filename.len() == 64 + ".0.bad".len() && filename.ends_with(b".bad") { return Some(Self::Bad); } if filename.len() == 64 + USING_MARKER_FILENAME_EXT.len() && filename.ends_with(USING_MARKER_FILENAME_EXT.as_bytes()) { return Some(Self::UsedMarker); } None > + { > + if filename.ends_with(b".bad") { > + return Some(Self::Bad) > + } else if filename.ends_with(USING_MARKER_FILENAME_EXT.as_bytes()) { > + return Some(Self::UsedMarker) > + } > + } > + None > + } > } > > #[test] > -- > 2.47.3 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel