* [PATCH 07/13] inbox: msg_by_*: remove $(size)ref args
2020-06-01 10:06 5% [PATCH 00/13] smsg: remove tricky {mime} field Eric Wong
@ 2020-06-01 10:06 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-06-01 10:06 UTC (permalink / raw)
To: meta
None of our current callers care about the size of the blob
we're retrieving, so stop wasting stack space and code for
it.
---
lib/PublicInbox/Inbox.pm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index bd1489e3699..38abdfe5847 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -310,25 +310,25 @@ sub nntp_usable {
}
# for v1 users w/o SQLite only
-sub msg_by_path ($$;$) {
- my ($self, $path, $ref) = @_;
- git($self)->cat_file('HEAD:'.$path, $ref);
+sub msg_by_path ($$) {
+ my ($self, $path) = @_;
+ git($self)->cat_file('HEAD:'.$path);
}
-sub msg_by_smsg ($$;$) {
- my ($self, $smsg, $ref) = @_;
+sub msg_by_smsg ($$) {
+ my ($self, $smsg) = @_;
# ghosts may have undef smsg (from SearchThread.node) or
# no {blob} field
return unless defined $smsg;
defined(my $blob = $smsg->{blob}) or return;
- git($self)->cat_file($blob, $ref);
+ git($self)->cat_file($blob);
}
sub smsg_mime {
- my ($self, $smsg, $ref) = @_;
- if (my $s = msg_by_smsg($self, $smsg, $ref)) {
+ my ($self, $smsg) = @_;
+ if (my $s = msg_by_smsg($self, $smsg)) {
$smsg->{mime} = PublicInbox::Eml->new($s);
return $smsg;
}
@@ -355,14 +355,14 @@ sub smsg_by_mid ($$) {
PublicInbox::Smsg::psgi_cull($smsg);
}
-sub msg_by_mid ($$;$) {
- my ($self, $mid, $ref) = @_;
+sub msg_by_mid ($$) {
+ my ($self, $mid) = @_;
over($self) or
- return msg_by_path($self, mid2path($mid), $ref);
+ return msg_by_path($self, mid2path($mid));
my $smsg = smsg_by_mid($self, $mid);
- $smsg ? msg_by_smsg($self, $smsg, $ref) : undef;
+ $smsg ? msg_by_smsg($self, $smsg) : undef;
}
sub recent {
^ permalink raw reply related [relevance 7%]
* [PATCH 00/13] smsg: remove tricky {mime} field
@ 2020-06-01 10:06 5% Eric Wong
2020-06-01 10:06 7% ` [PATCH 07/13] inbox: msg_by_*: remove $(size)ref args Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-06-01 10:06 UTC (permalink / raw)
To: meta
Storing a large PublicInbox::Eml (or in the past, Email::MIME)
object inside a small PublicInbox::Smsg object has historically
been bloat-prone[1] since there may be many small smsgs in
memory at once
Hundreds or thousands of $smsg objects can linger in memory due
to search results and message threading operations. So keep
$eml and $smsg objects independent of each other, for now.
Instead, we'll introduce a $smsg->populate($eml) API to handle
filling in the keys for the importer, indexer, and
non-SQLite-using WWW users.
Furthermore, $smsg->$field dispatch has always been measurably
faster than $smsg->{$field} access in NNTP. Since $smsg->$field
became read-only with the removal of $smsg->{mime}, we can
abandon the $smsg->$field invocations and favor of direct hash
access.
[1] the prime example being what commit 7d02b9e64455831d fixed
("view: stop storing all MIME objects on large threads")
Eric Wong (13):
inbox: introduce smsg_eml method
wwwatomstream: convert callers to use smsg_eml
v2writable: fix non-sensical interpolation in BUG message
import: modernize to use Perl 5.10 features
smsg: introduce ->populate method
smsg: get rid of ->wrap initializer, too
inbox: msg_by_*: remove $(size)ref args
www: remove smsg_mime API and adjust callers
nntp: smsg_range_i: favor ->{$field} lookups when possible
smsg: get rid of remaining {mime} users
smsg: remove ->bytes and ->lines methods
smsg: remove remaining accessor methods
wwwatomstream: drop smsg->{mid} fallback for non-SQLite
Documentation/mknews.perl | 7 +-
lib/PublicInbox/ExtMsg.pm | 2 +-
lib/PublicInbox/Feed.pm | 8 +-
lib/PublicInbox/Import.pm | 69 ++++++++---------
lib/PublicInbox/Inbox.pm | 32 ++++----
lib/PublicInbox/Mbox.pm | 2 +-
lib/PublicInbox/NNTP.pm | 14 +++-
lib/PublicInbox/OverIdx.pm | 3 +-
lib/PublicInbox/SearchIdx.pm | 33 ++++-----
lib/PublicInbox/SearchView.pm | 6 +-
lib/PublicInbox/Smsg.pm | 123 +++++++++++--------------------
lib/PublicInbox/SolverGit.pm | 4 +-
lib/PublicInbox/V2Writable.pm | 11 +--
lib/PublicInbox/View.pm | 63 ++++++++--------
lib/PublicInbox/WwwAtomStream.pm | 8 +-
t/altid.t | 3 +-
t/altid_v2.t | 3 +-
t/import.t | 3 +-
t/search.t | 46 +++++++-----
t/v2mda.t | 4 +-
t/v2writable.t | 5 +-
21 files changed, 207 insertions(+), 242 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-06-01 10:06 5% [PATCH 00/13] smsg: remove tricky {mime} field Eric Wong
2020-06-01 10:06 7% ` [PATCH 07/13] inbox: msg_by_*: remove $(size)ref args Eric Wong
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).