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 32915B8C08 for ; Mon, 11 Mar 2024 14:22:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1BC8D964C for ; Mon, 11 Mar 2024 14:22:09 +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 ; Mon, 11 Mar 2024 14:22:05 +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 7475444B35 for ; Mon, 11 Mar 2024 14:22:05 +0100 (CET) Date: Mon, 11 Mar 2024 14:21:59 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240305092703.126906-1-c.ebner@proxmox.com> <20240305092703.126906-8-c.ebner@proxmox.com> In-Reply-To: <20240305092703.126906-8-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1710162132.fmnwagxrtv.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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: Re: [pbs-devel] [RFC v2 pxar 07/36] encoder: add payload reference capability 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, 11 Mar 2024 13:22:09 -0000 On March 5, 2024 10:26 am, Christian Ebner wrote: > Allows to encode regular files with a payload reference within a > separate payload archive rather than encoding the payload within the > regular archive. >=20 > Following the PXAR_PAYLOAD_REF marked header, the payload offset and > size are encoded. >=20 > Signed-off-by: Christian Ebner > --- > changes since version 1: > - get rid of unused sub method impl for PayloadOffset >=20 > src/encoder/aio.rs | 15 ++++++++++++++- > src/encoder/mod.rs | 43 +++++++++++++++++++++++++++++++++++++++++++ > src/encoder/sync.rs | 18 +++++++++++++++++- > 3 files changed, 74 insertions(+), 2 deletions(-) >=20 > diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs > index 60b11cd..87d75ef 100644 > --- a/src/encoder/aio.rs > +++ b/src/encoder/aio.rs > @@ -5,7 +5,7 @@ use std::path::Path; > use std::pin::Pin; > use std::task::{Context, Poll}; > =20 > -use crate::encoder::{self, LinkOffset, SeqWrite}; > +use crate::encoder::{self, LinkOffset, PayloadOffset, SeqWrite}; > use crate::format; > use crate::Metadata; > =20 > @@ -98,6 +98,19 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { > // content.as_async_reader(), > // ).await > // } > + // > + /// Encode a payload reference, returning the payload offset within = the payload stream > + pub async fn add_payload_ref( > + &mut self, > + metadata: &Metadata, > + file_name: &Path, > + file_size: u64, > + payload_offset: PayloadOffset, > + ) -> io::Result<()> { > + self.inner > + .add_payload_ref(metadata, file_name.as_ref(), file_size, pa= yload_offset) > + .await > + } > =20 > /// Create a new subdirectory. Note that the subdirectory has to be = finished by calling the > /// `finish()` method, otherwise the entire archive will be in an er= ror state. > diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs > index 962087a..1baa221 100644 > --- a/src/encoder/mod.rs > +++ b/src/encoder/mod.rs > @@ -38,6 +38,24 @@ impl LinkOffset { > } > } > =20 > +/// File reference used to create payload references. > +#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Ord, PartialOrd)] > +pub struct PayloadOffset(u64); > + > +impl PayloadOffset { > + /// Get the raw byte offset of this link. > + #[inline] > + pub fn raw(self) -> u64 { > + self.0 > + } > + > + /// Return a new PayloadOffset, positively shifted by offset > + #[inline] > + pub fn add(&self, offset: u64) -> Self { > + Self(self.0 + offset) > + } > +} > + > /// Sequential write interface used by the encoder's state machine. > /// > /// This is our internal writer trait which is available for `std::io::W= rite` types in the > @@ -472,6 +490,31 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { > Ok(offset) > } > =20 > + /// Encode a payload reference, returning the payload offset within = the payload stream this doesn't return the offset though? > + pub async fn add_payload_ref( > + &mut self, > + metadata: &Metadata, > + file_name: &Path, > + file_size: u64, > + payload_offset: PayloadOffset, > + ) -> io::Result<()> { > + if self.payload_output.as_mut().is_none() { > + io_bail!("unable to add payload reference"); > + } > + > + let mut payload_ref =3D payload_offset.raw().to_le_bytes().to_ve= c(); > + payload_ref.append(&mut file_size.to_le_bytes().to_vec()); another copy of manually encoding a PayloadRef (see patch #2) > + let _this_offset: LinkOffset =3D self > + .add_file_entry( > + Some(metadata), > + file_name, > + Some((format::PXAR_PAYLOAD_REF, &payload_ref)), > + ) > + .await?; > + > + Ok(()) > + } > + > /// Return a file offset usable with `add_hardlink`. > pub async fn add_symlink( > &mut self, > diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs > index a7c350e..90af8f9 100644 > --- a/src/encoder/sync.rs > +++ b/src/encoder/sync.rs > @@ -6,7 +6,7 @@ use std::pin::Pin; > use std::task::{Context, Poll}; > =20 > use crate::decoder::sync::StandardReader; > -use crate::encoder::{self, LinkOffset, SeqWrite}; > +use crate::encoder::{self, LinkOffset, PayloadOffset, SeqWrite}; > use crate::format; > use crate::util::poll_result_once; > use crate::Metadata; > @@ -100,6 +100,22 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { > )) > } > =20 > + /// Encode a payload reference, returning the payload offset within = the payload stream > + pub async fn add_payload_ref( > + &mut self, > + metadata: &Metadata, > + file_name: &Path, > + file_size: u64, > + payload_offset: PayloadOffset, > + ) -> io::Result<()> { > + poll_result_once(self.inner.add_payload_ref( > + metadata, > + file_name.as_ref(), > + file_size, > + payload_offset, > + )) > + } > + > /// Create a new subdirectory. Note that the subdirectory has to be = finished by calling the > /// `finish()` method, otherwise the entire archive will be in an er= ror state. > pub fn create_directory>( > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20