From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 2/3] imaptracker: update_last: simplify callers
Date: Fri, 28 Aug 2020 10:12:59 +0000 [thread overview]
Message-ID: <20200828101300.17939-3-e@yhbt.net> (raw)
In-Reply-To: <20200828101300.17939-1-e@yhbt.net>
By making it a no-op if last_uid is not defined. This isn't a
hot code path, so the extra method dispatch isn't an issue.
It'll save some indentation/wrapping in future commits.
---
lib/PublicInbox/IMAPTracker.pm | 5 +++--
lib/PublicInbox/WatchMaildir.pm | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index 92f21584..be9caf76 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -49,13 +49,14 @@ SELECT uid_validity, uid FROM imap_last WHERE url = ?
}
sub update_last ($$$) {
- my ($self, $validity, $last) = @_;
+ my ($self, $validity, $last_uid) = @_;
+ return unless defined $last_uid;
my $sth = $self->{dbh}->prepare_cached(<<'');
INSERT OR REPLACE INTO imap_last (url, uid_validity, uid)
VALUES (?, ?, ?)
$self->lock_acquire;
- my $rv = $sth->execute($self->{url}, $validity, $last);
+ my $rv = $sth->execute($self->{url}, $validity, $last_uid);
$self->lock_release;
$rv;
}
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 78aec8a2..a227a6fd 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -494,7 +494,7 @@ sub imap_fetch_all ($$$) {
last if $self->{quit};
}
_done_for_now($self);
- $itrk->update_last($r_uidval, $last_uid) if defined $last_uid;
+ $itrk->update_last($r_uidval, $last_uid);
} until ($err || $self->{quit});
$err;
}
@@ -919,7 +919,7 @@ sub nntp_fetch_all ($$$) {
$last_art = $art;
}
_done_for_now($self);
- $itrk->update_last(0, $last_art) if defined $last_art;
+ $itrk->update_last(0, $last_art);
$err;
}
next prev parent reply other threads:[~2020-08-28 10:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 10:12 [PATCH 0/3] more watch-related stuff Eric Wong
2020-08-28 10:12 ` [PATCH 1/3] watch: flush changes to inbox before updating IMAPTracker Eric Wong
2020-08-28 10:12 ` Eric Wong [this message]
2020-08-28 10:13 ` [PATCH 3/3] tests: check-run: show skipped tests Eric Wong
2020-08-28 22:18 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200828101300.17939-3-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).