From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
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 DEBDF93960
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 15:43:16 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BD0FF9911
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 15:42:46 +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 <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 15:42:45 +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 8141743FC3
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 15:42:45 +0100 (CET)
Date: Tue, 20 Feb 2024 15:42:44 +0100
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Message-ID: <20240220154244.5a9962e2@rosa.proxmox.com>
In-Reply-To: <20240209125440.2572239-2-d.csapak@proxmox.com>
References: <20240209125440.2572239-1-d.csapak@proxmox.com>
<20240209125440.2572239-2-d.csapak@proxmox.com>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.085 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: [pmg-devel] applied: [PATCH pmg-api 01/12] RuleCache: remove
unnecessary copying of marks
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 20 Feb 2024 14:43:16 -0000
applied this one - Thanks!
On Fri, 9 Feb 2024 13:54:25 +0100
Dominik Csapak <d.csapak@proxmox.com> wrote:
> two things that are wrong here
> * what_match_targets never returns a non empty list
> * we copy the list just returned just to append it to itself again
>
> My guess is that we meant to copy the original list, not the just
> acquired one, and append it to the one just received. But that never did
> make a difference, since we only ever check for defined-ness on that
> exact list, and the only Object that this applies to (Spam) always
> returns an empty list with the spaminfo (so it's always defined in that
> case).
>
> Since this was always the behavior AFAICT, just remove the unnecessary
> copy of the list for now. If we encounter any actual bugs with that, we
> can still implement it back in the right way (copy the original list).
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/PMG/RuleCache.pm | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/src/PMG/RuleCache.pm b/src/PMG/RuleCache.pm
> index b8690ea..51d8a07 100644
> --- a/src/PMG/RuleCache.pm
> +++ b/src/PMG/RuleCache.pm
> @@ -322,9 +322,7 @@ sub what_match {
> my $target_info;
> if ($target_info = $obj->what_match_targets($queue, $element, $msginfo, $dbh)) {
> foreach my $k (keys %$target_info) {
> - my $cmarks = $target_info->{$k}->{marks}; # make a copy
> $res->{$k} = $target_info->{$k};
> - push @{$res->{$k}->{marks}}, @$cmarks if $cmarks;
> }
> }
> }