From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8C2191FF13F for ; Thu, 26 Feb 2026 15:40:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D3B6933FC1; Thu, 26 Feb 2026 15:41:36 +0100 (CET) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v1 proxmox-backup 03/11] datastore+server: sort by key instead of using comparison functions Date: Thu, 26 Feb 2026 15:40:17 +0100 Message-ID: <20260226144033.211039-4-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226144033.211039-1-r.obkircher@proxmox.com> References: <20260226144033.211039-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772116845228 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 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 Message-ID-Hash: FM7YL73R255CMGWF3STKYKTZIGOJMBXH X-Message-ID-Hash: FM7YL73R255CMGWF3STKYKTZIGOJMBXH X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Make sorting more readable and fix mulitple clippy warnings. Signed-off-by: Robert Obkircher --- pbs-datastore/src/backup_info.rs | 4 ++-- pbs-datastore/src/datastore.rs | 4 +--- src/server/pull.rs | 2 +- src/server/push.rs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 859039cf..9e298ee8 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -851,10 +851,10 @@ impl BackupInfo { pub fn sort_list(list: &mut [BackupInfo], ascendending: bool) { if ascendending { // oldest first - list.sort_unstable_by(|a, b| a.backup_dir.dir.time.cmp(&b.backup_dir.dir.time)); + list.sort_unstable_by_key(|a| a.backup_dir.dir.time); } else { // newest first - list.sort_unstable_by(|a, b| b.backup_dir.dir.time.cmp(&a.backup_dir.dir.time)); + list.sort_unstable_by_key(|b| std::cmp::Reverse(b.backup_dir.dir.time)); } } diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 7ad3d917..51e38ea4 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -2250,9 +2250,7 @@ impl DataStore { match self.inner.chunk_order { // sorting by inode improves data locality, which makes it lots faster on spinners - ChunkOrder::Inode => { - chunk_list.sort_unstable_by(|(_, ino_a), (_, ino_b)| ino_a.cmp(ino_b)) - } + ChunkOrder::Inode => chunk_list.sort_unstable_by_key(|(_, ino)| *ino), ChunkOrder::None => {} } diff --git a/src/server/pull.rs b/src/server/pull.rs index 15d8b9de..57c5ef32 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -622,7 +622,7 @@ async fn pull_group( .source .list_backup_snapshots(source_namespace, group) .await?; - raw_list.sort_unstable_by(|a, b| a.backup.time.cmp(&b.backup.time)); + raw_list.sort_unstable_by_key(|a| a.backup.time); let target_ns = source_namespace.map_prefix(¶ms.source.get_ns(), ¶ms.target.ns)?; diff --git a/src/server/push.rs b/src/server/push.rs index d7884fce..b1c509b0 100644 --- a/src/server/push.rs +++ b/src/server/push.rs @@ -679,7 +679,7 @@ pub(crate) async fn push_group( .source .list_backup_snapshots(namespace, group) .await?; - snapshots.sort_unstable_by(|a, b| a.backup.time.cmp(&b.backup.time)); + snapshots.sort_unstable_by_key(|a| a.backup.time); if snapshots.is_empty() { info!("Group '{group}' contains no snapshots to sync to remote"); -- 2.47.3