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 85A8F1FF173 for ; Mon, 11 Nov 2024 16:44:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3554FFA2E; Mon, 11 Nov 2024 16:44:05 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 11 Nov 2024 16:43:23 +0100 Message-Id: <20241111154353.482734-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241111154353.482734-1-c.ebner@proxmox.com> References: <20241111154353.482734-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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] [PATCH v7 proxmox-backup 01/31] sync: pull: optimize backup group sorting 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" `BackupGroup` implements `cmp::Ord`, so use that implementation for comparing groups during sorting. Furtuher, only sort the list of backup groups after filtering, thereby possibly reducing the number of required comparisons. No functional changes. Signed-off-by: Christian Ebner --- changes since version 6: - not present in previous version src/server/pull.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index d9584776e..c12ecec82 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -829,22 +829,16 @@ pub(crate) async fn pull_ns( namespace: &BackupNamespace, params: &mut PullParameters, ) -> Result<(StoreProgress, SyncStats, bool), Error> { - let mut list: Vec = params.source.list_groups(namespace, ¶ms.owner).await?; - - list.sort_unstable_by(|a, b| { - let type_order = a.ty.cmp(&b.ty); - if type_order == std::cmp::Ordering::Equal { - a.id.cmp(&b.id) - } else { - type_order - } - }); + let list: Vec = params.source.list_groups(namespace, ¶ms.owner).await?; let unfiltered_count = list.len(); - let list: Vec = list + let mut list: Vec = list .into_iter() .filter(|group| group.apply_filters(¶ms.group_filter)) .collect(); + + list.sort_unstable(); + info!( "found {} groups to sync (out of {unfiltered_count} total)", list.len() -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel