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 F35431FF15C for ; Fri, 17 Oct 2025 16:11:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8E78C50C8; Fri, 17 Oct 2025 16:11:57 +0200 (CEST) From: Christian Ebner To: pdm-devel@lists.proxmox.com Date: Fri, 17 Oct 2025 16:11:29 +0200 Message-ID: <20251017141137.845295-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251017141137.845295-1-c.ebner@proxmox.com> References: <20251017141137.845295-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760710310714 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [resources.rs] Subject: [pdm-devel] [PATCH datacenter-manager v2 03/11] server: api: refactor filter logic for resource post gathering X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Avoids to loop twice over the list of remote resources if a filter is set, at the cost of checking the presence of the filter on each element. In preparation to also pass along the remote to the remote search term matching. No functional changes intended. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version server/src/api/resources.rs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs index 21143a8..a00742b 100644 --- a/server/src/api/resources.rs +++ b/server/src/api/resources.rs @@ -292,18 +292,21 @@ pub(crate) async fn get_resources_impl( let mut remote_resources = Vec::new(); for handle in join_handles { - remote_resources.push(handle.await?); - } - - if !filters.is_empty() { - remote_resources.retain(|res| { - if !res.resources.is_empty() { - return true; - } - filters.matches(|filter| { - remote_matches_search_term(&res.remote, Some(res.error.is_none()), filter) - }) - }) + let remote_resource = handle.await?; + + if filters.is_empty() { + remote_resources.push(remote_resource); + } else if !remote_resource.resources.is_empty() { + remote_resources.push(remote_resource); + } else if filters.matches(|filter| { + remote_matches_search_term( + &remote_resource.remote, + Some(remote_resource.error.is_none()), + filter, + ) + }) { + remote_resources.push(remote_resource); + } } Ok(remote_resources) -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel